changeset 9059:665657341a80

[gaim-migrate @ 9835] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 25 May 2004 04:28:54 +0000
parents cde9fb3546ed
children 0293ed13c770
files po/ChangeLog po/fr.po po/pt.po po/zh_CN.po
diffstat 4 files changed, 8376 insertions(+), 5539 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue May 25 03:54:12 2004 +0000
+++ b/po/ChangeLog	Tue May 25 04:28:54 2004 +0000
@@ -6,7 +6,9 @@
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (Canadian) translation added (Adam Weinberger)
+	* French translation updated (Eric Boumaour)
 	* German Translation updated (Bjoern Voigt)
+	* Portuguese translation updated (Duarte Serrano Goncalves Henriques)
 	* Slovenian translation added (Matjaz Horvat)
 
 version 0.77 (04/22/2004):
--- a/po/fr.po	Tue May 25 03:54:12 2004 +0000
+++ b/po/fr.po	Tue May 25 04:28:54 2004 +0000
@@ -17,9 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
-"PO-Revision-Date: 2004-04-18 21:52-0700\n"
+"POT-Creation-Date: 2004-05-24 21:09-0400\n"
+"PO-Revision-Date: 2004-05-24 21:15-0700\n"
 "Last-Translator: Éric <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +26,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "Suppression des messages d'erreur"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "Cache les fenêtres de déconnexion"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "Cache les fenêtres d'erreurs à la connexion"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -34,7 +45,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "Reconnexion automatique"
 
@@ -42,7 +53,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Ce plugin vous reconnecte automatiquement à chaque déconnexion."
 
@@ -162,19 +173,21 @@
 msgid "New..."
 msgstr "Nouveau..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Absent"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
 msgid "Back"
 msgstr "De retour"
 
@@ -182,16 +195,15 @@
 msgid "Mute Sounds"
 msgstr "Silencieux"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "Transferts de fichier"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "Comptes"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -279,16 +291,17 @@
 msgstr "Adresse URL AIM non valide"
 
 #: plugins/gaim-remote/remote.c:651
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
-msgstr "Impossible de sauver l'image : %s\n"
+msgstr ""
+"Impossible d'assigner %s au socket :\n"
+"%s"
 
 #: plugins/gaim-remote/remote.c:674
-#, fuzzy
 msgid "Unable to open socket"
-msgstr "Impossible de lire le socket"
+msgstr "Impossible d'ouvrir le socket"
 
 #. *< api_version
 #. *< type
@@ -411,15 +424,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
+#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "Aucun"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
+#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nom"
 
@@ -436,13 +449,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
 msgid "Search"
 msgstr "Recherche"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "Groupe :"
 
@@ -480,28 +493,28 @@
 msgid "_Associate Buddy"
 msgstr "_Associer un contact"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "Contacts"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
 msgstr "Configuration de l'intégration avec Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Choisissez tous les comptes dont les contacts seront automatiquement ajoutés."
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Compte"
 
@@ -512,7 +525,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
 msgstr "Intégration avec Evolution"
 
@@ -520,7 +533,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
 msgid "Provides integration with Ximian Evolution."
 msgstr "Fournit une intégration avec Evolution de Ximian."
 
@@ -538,7 +551,7 @@
 
 #: plugins/gevolution/new_person_dialog.c:298
 msgid "Screenname:"
-msgstr "Pseudo :"
+msgstr "Utilisateur :"
 
 #. Optional Information section
 #: plugins/gevolution/new_person_dialog.c:318
@@ -547,7 +560,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "Icône du contact"
 
@@ -563,15 +576,15 @@
 msgid "E-mail:"
 msgstr "Adresse électronique :"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "Historique"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Affiche l'historique dans les nouvelles conversations."
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -599,31 +612,27 @@
 msgstr ""
 "Met en icône la liste de contacts et les conversations lors des absences."
 
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "Durée d'inactivité"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Mettre"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "inactif depuis"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "minutes"
-
-#: plugins/idle.c:96
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "Minutes"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "I'nactivat'eur"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "Durée d'inactivité pour le compte"
+
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Changer"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "I'nactivat'eur"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:793
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Permet de changer manuellement le temps d'inactivité"
 
@@ -873,7 +882,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "Test des événements"
 
@@ -881,7 +890,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "Vérifie que tous les événements fonctionnent correctement."
 
@@ -995,7 +1004,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fournit une interface pour les bibliothèques SSL"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:910
 #, c-format
 msgid "%s has gone away."
 msgstr "%s est passé absent"
@@ -1038,11 +1047,11 @@
 "Indique dans la fenêtre de conversation quand un contact part ou revient "
 "d'une absence ou d'une inactivité."
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Chargeur de plugins Tcl"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fournit le support pour charger des plugins Tcl"
 
@@ -1073,6 +1082,10 @@
 msgid "Delay"
 msgstr "Intervalle"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "minutes"
+
 #: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "_Appliquer"
@@ -1097,30 +1110,30 @@
 msgstr "Ajoute l'heure dans la conversation à intervalle régulier."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "Opacité :"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "Fenêtres de messages"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "Fenêtre de _messages transparente"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "Afficher la barre de défilement dans la fenêtre"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "Fenêtre de la liste de contacts"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "Fenêtre de la liste de _contacts transparente"
 
@@ -1131,24 +1144,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:466
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Transparence variable pour la liste de contacts et les conversations."
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:468
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"Active la transparence des fenêtres de conversation.\n"
+"Active la transparence des fenêtres de conversation et de la liste de "
+"contacts.\n"
 "\n"
-"Note : Ce plugin nécessite Windows 2000 ou Windows XP."
+"Note : Ce plugin nécessite Windows 2000 ou Windows XP."
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
@@ -1164,8 +1182,8 @@
 msgstr "_Démarrer Gaim au lancement de Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
@@ -1184,8 +1202,8 @@
 msgstr "Liste de contacts toujours _visible"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1201,16 +1219,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Options spécifiques à Gaim Windows"
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "À propos de Gaim"
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1220,306 +1238,331 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr et Gadu-Gadu. Il est écrit en Gtk+ "
 "et est distribué sous licence GPL.<BR><BR>"
 
-#: src/about.c:104
-#, fuzzy
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"3\">IRC :</FONT> #gaim et #gaim-fr sur irc.freenode.net<BR><BR>"
-
-#: src/about.c:109
-msgid "Active Developers"
-msgstr "Codeurs actifs"
+"<FONT SIZE=\"4\">IRC :</FONT> #gaim et #gaim-fr sur irc.freenode.net<BR><BR>"
 
 #: src/about.c:110
+msgid "Active Developers"
+msgstr "Codeurs actifs"
+
+#: src/about.c:111
 msgid "maintainer"
 msgstr "mainteneur"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "codeur principal"
 
-#: src/about.c:115
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "codeur et webmestre"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
 msgstr "portage win32"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "codeur"
 
-#: src/about.c:122
+#: src/about.c:124
 msgid "support"
 msgstr "support"
 
-#: src/about.c:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: src/about.c:144
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: src/about.c:145
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "ancien mainteneur de libfaim"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "ancien codeur principal"
 
-#: src/about.c:149
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "ancien mainteneur"
 
-#: src/about.c:150
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "ancien codeur Jabber"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "original author"
 msgstr "auteur original"
 
-#: src/about.c:154
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker et conducteur désigné"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: src/about.c:163 src/about.c:197
+#: src/about.c:165 src/about.c:202
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "Tchèque"
 
-#: src/about.c:165
+#: src/about.c:167
 msgid "Danish"
 msgstr "Danois"
 
-#: src/about.c:166
+#: src/about.c:168
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:169
+msgid "Canadian English"
+msgstr "Anglais canadien"
+
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "Allemand"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:172 src/about.c:206
 msgid "Finnish"
 msgstr "Finnois"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "Français"
 
-#: src/about.c:171
+#: src/about.c:174
+msgid "Hebrew"
+msgstr "Hébreu"
+
+#: src/about.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:172
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "Italien"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/about.c:175
+#: src/about.c:179
 msgid "Dutch; Flemish"
 msgstr "Hollandais, flamand"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: src/about.c:177
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "Polonais"
 
-#: src/about.c:179
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: src/about.c:180
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "Portugais brésilien"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Romanian"
 msgstr "Roumain"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "Russe"
 
-#: src/about.c:183
+#: src/about.c:187
 msgid "Serbian"
 msgstr "Serbe"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:188
+msgid "Slovenian"
+msgstr "Slovène"
+
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "Suédois"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Équipe Gnome vi"
 
-#: src/about.c:186
+#: src/about.c:191
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: src/about.c:187
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: src/about.c:194
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: src/about.c:195
+#: src/about.c:200
 msgid "Amharic"
 msgstr "Amharique"
 
-#: src/about.c:196
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "Hébreu"
-
-#: src/about.c:205
-msgid "Japanese"
-msgstr "Japonais"
-
 #: src/about.c:209
+msgid "Japanese"
+msgstr "Japonais"
+
+#: src/about.c:213
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: src/about.c:211
+#: src/about.c:215
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:998
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diffèrent"
 
-#: src/account.c:288
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "Remplissez tous les champs"
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "Mot de passe courant"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
 msgstr "Changer le mot de passe pour %s"
 
-#: src/account.c:341
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
 msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
+#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
+#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
+#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
+#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/request.h:1242
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
+#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
+#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
+#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
 msgstr "Changer les informations pour %s"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "Absent !"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "Je suis de retour !"
 
-#: src/away.c:375
-msgid "New Away Message"
-msgstr "Nouveau message d'absence"
-
-#: src/away.c:395
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer le message d'absence « %s » ?"
+
+#: src/away.c:332 src/away.c:423
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
-#: src/away.c:590
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "Enlever"
+
+#: src/away.c:403
+msgid "New Away Message"
+msgstr "Nouveau message d'absence"
+
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "Absent partout"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "Discussions"
 
@@ -1544,108 +1587,113 @@
 msgid "Group not removed"
 msgstr "Groupe non supprimé"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "Nom de groupe non valide"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
+#: src/blist.c:2236
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
 msgstr ""
 "Une erreur est survenue à la lecture de la liste de contacts. La liste n'a "
-"pas été chargée."
-
-#: src/blist.c:2222
+"pas été chargée et l'ancien fichier a été renommé blist.xml~."
+
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "Erreur de liste de contacts"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin pour le protocole %s manquant"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Erreur d'enregistrement"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Erreur de connexion"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "Impossible d'envoyer le message : trop gros"
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon"
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon"
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d supplémentaires)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " a quitté le salon (%s)"
 
-#: src/conversation.c:2467
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "Par groupe"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "Par compte"
 
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "Par nombre de conversations"
+
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Donner un avertissement"
@@ -1721,11 +1769,11 @@
 msgid "Remove Contact"
 msgstr "Supprimer contact"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "_Pseudonyme"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "_Compte"
 
@@ -1746,75 +1794,77 @@
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les informations"
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "Changer la couleur du texte"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "Changer la couleur du fond"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Changer la police"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:575
+msgid "Get User Log"
+msgstr "Archives utilisateur"
+
+#: src/dialogs.c:577
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les archives"
+
+#: src/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "Vous ne pouvez créer un message d'absence avec un titre vide."
 
-#: src/dialogs.c:694
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Donnez un titre au message ou cliquez « Utiliser » pour utiliser ce message "
 "sans le sauver."
 
-#: src/dialogs.c:704
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez créer un message d'absence vide"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "Nouveau message d'absence"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "Titre : "
 
-#: src/dialogs.c:843
-msgid "Save & Use"
-msgstr "Enregistrer et utiliser"
-
-#: src/dialogs.c:847
-msgid "Use"
-msgstr "Utiliser"
-
-#: src/dialogs.c:868
+#: src/dialogs.c:781
+msgid "_Save"
+msgstr "_Enregistrer"
+
+#: src/dialogs.c:785
+msgid "Sa_ve & Use"
+msgstr "Enregistrer _et utiliser"
+
+#: src/dialogs.c:789
+msgid "_Use"
+msgstr "_Utiliser"
+
+#: src/dialogs.c:811
 msgid "Alias Chat"
 msgstr "Donner un alias à un groupe de discussion"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:812
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:885
+#: src/dialogs.c:828
 msgid "Alias Contact"
 msgstr "Donner un alias à un contact"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:829
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:846
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: src/dialogs.c:905
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
@@ -1928,19 +1978,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Désolé, je suis parti pour un moment. À plus."
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "standard pas original"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "Alphabétique"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "Par état"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "Par la taille des archives"
 
@@ -1964,15 +2014,15 @@
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
-msgstr "Pseudo :"
+msgstr "Utilisateur :"
 
 #: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "Alias :"
 
@@ -2033,7 +2083,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres globaux"
 
@@ -2049,15 +2099,15 @@
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "_Port :"
 
@@ -2065,7 +2115,7 @@
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
@@ -2087,7 +2137,7 @@
 msgstr "Afficher moins d'options"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -2100,14 +2150,15 @@
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
 msgid "Screen Name"
 msgstr "Pseudo"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "En ligne"
 
@@ -2139,25 +2190,17 @@
 msgstr "Ajouter cet utilisateur à la liste de contacts ?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
+#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Vous n'avez pas de protocole disponible vous permettant de joindre des "
-"groupes de discussion."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "Joindre une discussion"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2165,191 +2208,199 @@
 "Saisissez les informations appropriées à propos du salon de discussions que "
 "vous voulez joindre.\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "_Compte :"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "_Message"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Joindre"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "Connexion auto"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Vous n'êtes connecté à aucun compte permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Joindre une discussion..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
-msgstr "/Contacts/Voir les _informations utilisateur..."
-
-#: src/gtkblist.c:2317
+msgstr "/Contacts/Voir les _informations..."
+
+#: src/gtkblist.c:2296
+msgid "/Buddies/View User _Log..."
+msgstr "/Contacts/Voir les arc_hives..."
+
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacts/Afficher les groupes _vides"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/_Ajouter un contact..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/Contacts/Déconne_xion"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/Outils/_Absence"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Outils/A_lertes"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Outils/Actions du _protocole"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2311
+msgid "/Tools/Account Ac_tions"
+msgstr "/Outils/Ac_tions des comptes"
+
+#: src/gtkblist.c:2312
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Outils/Action des pl_ugins"
+
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/Outils/_Comptes"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/Transferts de _fichier"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/Outils/Liste des _salons de discussion"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/F_iltres"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/Outils/Voir les archives _système"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "/Aide/_Aide en ligne"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/Aide/_A propos de"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "Renommer un groupe"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "Nouveau nom du groupe"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "Saisissez le nouveau nom pour le groupe sélectionné"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2358,16 +2409,20 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>Status :</b> Déconnecté"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2435
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>Status :</b> Déconnecté"
+
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2375,7 +2430,7 @@
 "\n"
 "<b>Compte :</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2383,7 +2438,7 @@
 "\n"
 "<b>Alias du contact :</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2391,7 +2446,7 @@
 "\n"
 "<b>Alias :</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2399,7 +2454,7 @@
 "\n"
 "<b>Pseudonyme :</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2407,7 +2462,7 @@
 "\n"
 "<b>Connexion :</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2415,7 +2470,7 @@
 "\n"
 "<b>Inactif :</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2423,7 +2478,7 @@
 "\n"
 "<b>Avertissement :</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2431,7 +2486,7 @@
 "\n"
 "<b>Description :</b> Bizarre"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2439,7 +2494,7 @@
 "\n"
 "<b>Status :</b> Fabuleux"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2447,77 +2502,96 @@
 "\n"
 "<b>Status :</b> Génial"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inactif (%dh%02dm) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactif (%dm) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Avertissements (%d%%) "
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "Déconnecté "
 
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2875
+msgid "/Buddies/Join a Chat..."
+msgstr "/Contacts/Joindre une discussion..."
+
+#: src/gtkblist.c:2878
+msgid "/Tools/Room List"
+msgstr "/Outils/Liste des salons"
+
+#: src/gtkblist.c:2881
+msgid "/Tools/Privacy"
+msgstr "/Outils/Filtres"
+
+#: src/gtkblist.c:3026
+msgid "/Tools/Away"
+msgstr "/Outils/Absence"
+
+#: src/gtkblist.c:3029
+msgid "/Tools/Buddy Pounce"
+msgstr "/Outils/Alertes"
+
 #: src/gtkblist.c:3032
-msgid "/Tools/Away"
-msgstr "/Outils/_Absence"
+msgid "/Tools/Account Actions"
+msgstr "/Outils/Actions du compte"
 
 #: src/gtkblist.c:3035
-msgid "/Tools/Buddy Pounce"
-msgstr "/Outils/A_lertes"
-
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/Outils/Actions du _protocole"
+msgid "/Tools/Plugin Actions"
+msgstr "/Outils/Actions des plugins"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacts/Ajouter les groupes vides"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "Envoyer un message instantané au contact sélectionné"
 
+#: src/gtkblist.c:3158
+msgid "Get information on the selected buddy"
+msgstr "Obtenir les informations sur le contact sélectionné"
+
 #: src/gtkblist.c:3161
-msgid "Get information on the selected buddy"
-msgstr "Obtenir les informations sur le contact sélectionné"
-
-#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "_Discussion"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "Joindre un groupe de discussions"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "_Absent"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "Choisir un message d'absence"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
+#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
+#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
 msgid "Add Buddy"
 msgstr "Nouveau contact"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3933
 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. "
@@ -2528,15 +2602,23 @@
 "sera affiché à la place du pseudo chaque fois que cela est possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "Compte :"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4237
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Vous n'avez pas de protocole disponible vous permettant de joindre des "
+"groupes de discussion."
+
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "Ajouter discussion"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4268
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2544,15 +2626,15 @@
 "Saisissez un alias et les informations nécessaires pour le groupe de "
 "discussion que vous voulez ajouter dans la liste de contacts.\n"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "Nouveau groupe"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4348
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
@@ -2606,20 +2688,20 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: src/gtkconv.c:191 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:582
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2627,441 +2709,448 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message optionnel d'invitation."
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "_Message :"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "Chercher"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "_Chercher : "
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "Message"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "Obtenir le message d'absence"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "Enlever"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "Animer"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "Cacher l'icône"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icône sous..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'écrire..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "_Envoyer en tant que"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3152
+msgid "/Conversation/Clear"
+msgstr "/Conversation/Effacer"
+
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/Donner un avertissement..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/Inviter..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Afficher la _barre de style"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Donner un avertissement..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: src/gtkconv.c:3249
-msgid "/Conversation/Block..."
-msgstr "/Conversation/Bloquer..."
-
-#: src/gtkconv.c:3253
-msgid "/Conversation/Add..."
-msgstr "/Conversation/Ajouter..."
-
-#: src/gtkconv.c:3257
-msgid "/Conversation/Remove..."
-msgstr "/Conversation/Supprimer..."
-
 #: src/gtkconv.c:3263
+msgid "/Conversation/Block..."
+msgstr "/Conversation/Bloquer..."
+
+#: src/gtkconv.c:3267
+msgid "/Conversation/Add..."
+msgstr "/Conversation/Ajouter..."
+
+#: src/gtkconv.c:3271
+msgid "/Conversation/Remove..."
+msgstr "/Conversation/Supprimer..."
+
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Afficher la barre de style"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "Envoyer"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "Réprimander"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "Donner un avertissement à l'interlocuteur"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "Bloquer les messages de l'interlocuteur"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "Ajouter l'interlocuteur à la liste de contacts"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "Supprimer l'interlocuteur de la liste de contacts"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "Voir les informations de l'interlocuteur"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "Inviter un utilisateur"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "Ajouter le salon de discussion à la liste de contacts"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "Supprimer le salon de discussion de la liste de contacts"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "Sujet :"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "Envoyer un message à cet utilisateur"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "Ignorer cet utilisateur"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/_Fermer"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "Enregistrer les archives de debuggage"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "Horodatage"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f Ko/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "Fini"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "Annulé"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "En attente de début de transfert"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Réception depuis :</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Envoi vers :</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr "Aucune application n'est configurée pour ouvrir ce type de fichier"
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "État"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Fichier"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "Taille"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "Reste"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "Fichier :"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "Status :"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "Temps écoulé :"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "Temps restant :"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "_Garder la fenêtre ouverte"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "_Effacer les transferts terminés"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "Afficher les détails du transfert"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "Cacher les détails du transfert"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Annulé"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "Échoué"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "Ce fichier n'existe pas"
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "Impossible d'envoyer un fichier de taille nulle"
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
 msgstr "Ce fichier existe déjà"
 
-#: src/gtkft.c:1131
+#. Open file selector to select the public key.
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s veut vous envoyer %s (%s)"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accepter la requête de transfert de %s ?"
 
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3072,19 +3161,31 @@
 "Hôte distant : %s\n"
 "Port distant : %d"
 
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "Coller comme _texte"
+
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "Couleur des liens hypertextes"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "Couleur pour afficher les liens hypertextes"
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse électronique"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3092,32 +3193,40 @@
 "Impossible de déterminer le type de l'image à partir de l'extension fournie. "
 "Choix de PNG par défaut."
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Erreur pendant l'enregistrement de l'image : %s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Changer la police"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "Changer la couleur du texte"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "Changer la couleur du fond"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Insérer un lien"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3125,65 +3234,77 @@
 "Saisissez l'URL et la description du lien à inclure. La description est "
 "facultative."
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Saisissez l'URL du lien à inclure."
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "Insérer un lien"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "Insérer une image"
 
+#: src/gtkimhtmltoolbar.c:638
+msgid "This theme has no available smileys."
+msgstr "Ce thème n'a pas de frimousses"
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "Gras"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "Italique"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "Police plus grande"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "Police plus petite"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "Police"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "Couleur du texte"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "Insérer un lien"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "Insérer une image"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
 msgstr "Insérer une frimousse"
 
@@ -3192,7 +3313,7 @@
 msgstr "Conversations avec"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "Journal du systême"
 
@@ -3204,17 +3325,17 @@
 msgstr[0] "%s a reçu %d nouveau message"
 msgstr[1] "%s a reçu %d nouveaux messages"
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De :</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Sujet :</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3225,7 +3346,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3236,185 +3357,185 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La commande pour le navigateur « %s » est non valide"
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:193
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:406 src/gtkpounce.c:846
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:406
 msgid "Edit Buddy Pounce"
 msgstr "Éditer une alerte"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:424
 msgid "Pounce Who"
 msgstr "Contact déclencheur"
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
+#: src/gtkpounce.c:451
+msgid "_Buddy name:"
 msgstr "_Contact :"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:475
 msgid "Pounce When"
 msgstr "Événements déclencheurs"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "_Connexion"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:485
 msgid "Sign _off"
 msgstr "Déconne_xion"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:487
 msgid "A_way"
 msgstr "_Absent"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:489
 msgid "Re_turn from away"
 msgstr "_Retour d'absence"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:491
 msgid "_Idle"
 msgstr "_Inactif"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:493
 msgid "Retur_n from idle"
 msgstr "Re_tour d'inactivité"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:495
 msgid "Buddy starts _typing"
 msgstr "Le contact commence à écr_ire"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:497
 msgid "Buddy stops t_yping"
 msgstr "Le contact s'arrête d'écrir_e"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:526
 msgid "Pounce Action"
 msgstr "Action de l'alerte"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:533
 msgid "Op_en an IM window"
 msgstr "Ouvrir une _fenêtre de message"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:534
 msgid "_Popup notification"
 msgstr "Ouvrir une fenêtre de _notification"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:535
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:536
 msgid "E_xecute a command"
 msgstr "Exécuter une c_ommande"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:537
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:541
 msgid "B_rowse..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:543
 msgid "Bro_wse..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:544
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:627
 msgid "Sav_e this pounce after activation"
 msgstr "_Sauver cette alerte après déclenchement"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:853
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une alerte"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:903
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s est en train de vous écrire"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:904
 #, c-format
 msgid "%s has signed on"
 msgstr "%s vient de se connecter"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:905
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s n'est plus inactif"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:906
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s n'est plus absent"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:907
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s a arrête de vous écrire"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:908
 #, c-format
 msgid "%s has signed off"
 msgstr "%s vient de se déconnecter"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:909
 #, c-format
 msgid "%s has become idle"
 msgstr "%s est devenu inactif"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:911
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "Interface"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Aff_icher le pseudonyme distant si aucun alias n'a été donné"
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:632
 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."
@@ -3423,507 +3544,411 @@
 "dessous.  De nouveau thèmes peuvent être installés en les faisant glisser "
 "dans la liste des thèmes."
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "Icône"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "Style"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "Gras (_B)"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "_Italique"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "So_uligné"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "Barré (_S)"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "Police"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "Utiliser une _police spécifique"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "Utiliser une _taille spécifique"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "Couleur"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "_Couleur de texte"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "Couleur de f_ond"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "Affichage"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "Afficher graphiquement les _smileys"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "Afficher l'_heure des messages"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "Afficher les _URLs comme des liens"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "Surligner les mots mal _orthographiés"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:784
 msgid "Ignore c_olors"
 msgstr "Ignorer les _couleurs"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:786
 msgid "Ignore font _faces"
 msgstr "Ignorer les _polices"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:788
 msgid "Ignore font si_zes"
 msgstr "Ignorer la _taille des polices"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "Ignorer le _style des messages reçus"
+
+#: src/gtkprefs.c:795
+msgid "Default Formatting"
+msgstr "Style par défaut"
+
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "Ajouter le style par _défaut aux messages envoyés"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Le texte des messages envoyés apparaîtra comme ceci avec les protocoles "
+"supportant l'ajout du style. :)"
+
+#: src/gtkprefs.c:832
+msgid "_Clear Formatting"
+msgstr "_Effacer le style"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "La touche _Entrée envoie les messages"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "C_trl-Entrée envoie les messages"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:875
 msgid "Window Closing"
 msgstr "Fermeture des fenêtres"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
 msgstr "E_chap ferme la fenêtre"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Ctrl-{B/I/U/S} insèrent des balises _HTML"
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:880
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Ctrl-{B/I/U/S} change le st_yle"
+
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl-(nombre) insère un _smiley"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
 msgstr "Tri de la liste de contacts"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "_Tri :"
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "Barre d'outils de la liste de contacts"
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
 msgid "Show _buttons as:"
 msgstr "Afficher les _boutons en tant que :"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
 msgid "Pictures"
 msgstr "Images"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
 msgid "Text"
 msgstr "Texte"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
 msgid "Pictures and text"
 msgstr "Images et texte"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "Fenêtre en avant-plan sur _réception d'un message"
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "Affichage des groupes"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "Afficher le _nombre de contacts dans chaque groupe"
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "Affichage des contacts"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "Afficher les _icônes des contacts"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "Afficher le niveau d'a_vertissement"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "Afficher les _temps d'inactivité"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "_Griser les contacts inactifs"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "Étendre les contacts multiples _automatiquement"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "_Position :"
 
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "Envoyer les _URLs comme des liens"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:976
+msgid "Number of conversations per window"
+msgstr "Nombre de conversations par fenêtre"
+
+#: src/gtkprefs.c:985
 msgid "Show _formatting toolbar"
 msgstr "Afficher la barre de _style"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:988
 msgid "Show a_liases in tabs/titles"
 msgstr "Montrer les _alias dans les onglets"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "Options des onglets"
 
-#: src/gtkprefs.c:947
-msgid "_Tab Placement:"
-msgstr "Position des _onglets :"
-
-#: src/gtkprefs.c:949
-msgid "Top"
-msgstr "Haut"
-
-#: src/gtkprefs.c:950
-msgid "Bottom"
-msgstr "Bas"
-
-#: src/gtkprefs.c:951
-msgid "Left"
-msgstr "Gauche"
-
-#: src/gtkprefs.c:952
-msgid "Right"
-msgstr "Droite"
-
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:993
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Afficher les messages et les discussions dans des fenêtres à onglets"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _same tabbed window"
 msgstr ""
 "Afficher les messages et les discussions dans une _seule fenêtre à onglets"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:1006
 msgid "Show _close button on tabs"
 msgstr "Afficher le bouton de fermeture (_X) sur les onglets"
 
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "Afficher l'_icône d'état sur les onglets"
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:1019
+msgid "_Tab Placement:"
+msgstr "Position des _onglets :"
+
+#: src/gtkprefs.c:1021
+msgid "Top"
+msgstr "Haut"
+
+#: src/gtkprefs.c:1022
+msgid "Bottom"
+msgstr "Bas"
+
+#: src/gtkprefs.c:1023
+msgid "Left"
+msgstr "Gauche"
+
+#: src/gtkprefs.c:1024
+msgid "Right"
+msgstr "Droite"
+
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
 msgid "Window"
 msgstr "Fenêtre"
 
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "_Largeur des nouvelles fenêtres :"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "_Hauteur des nouvelles fenêtres :"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "Hauteur de la _zone de saisie :"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "Cacher la fenêtre lors de l'_envoi"
-
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1073
 msgid "Buddy Icons"
 msgstr "Icône des contacts"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "Activer l'_animation de l'icône des contacts"
 
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "Afficher les noms d'_utilisateur dans la fenêtre"
-
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "Notification de saisie"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1080
 msgid "Notify buddies that you are _typing to them"
 msgstr "_Notifier les contacts que vous êtes en train de leur écrire"
 
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "Complétion de mots"
-
-#: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "Complétion des _pseudos"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "C_omplétion de mots à l'ancienne"
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr "Afficher les a_rrivées dans la fenêtre"
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr "Afficher les _départs dans la fenêtre"
-
-#: src/gtkprefs.c:1090
+#: src/gtkprefs.c:1115
 msgid "Co_lorize screen names"
 msgstr "_Colorier les pseudos"
 
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4811
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1138
 msgid "_Autodetect IP Address"
 msgstr "_Détection auto de l'adresse IP"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1147
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1171
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "Spécifier _manuellement la plage de ports à écouter"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "_Premier port : "
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "_Dernier port :"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "Type de serveur mandataire"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "Aucun"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "Navigateur de Gnome"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "_Ouvrir le lien :"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "Dans une fenêtre ouverte"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_Manuel: _Manuel :\n"
+"_Manuel :\n"
 "(%s pour l'URL)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "Archives de messages"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1493
 msgid "Log _Format:"
 msgstr "_Format des archive :"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1496
 msgid "_Log all instant messages"
 msgstr "Archiver tous les _messages"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1498
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1501
 msgid "System Logs"
 msgstr "Journaux du systême"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1503
 msgid "_Enable system log"
 msgstr "Activer l'archivage du _journal systême"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1506
 msgid "Log when buddies _sign on/sign off"
 msgstr "Archiver à la _connexion et déconnexion des contacts"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1512
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Archiver le début d'_inactivité des contacts"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "Archiver les _absences et retours des contacts"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Archiver ses _propres connexions, inactivités et absences"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: src/gtkprefs.c:1551
-#, fuzzy
-msgid "Sounds when you _log in"
-msgstr "Aucun son lors de la _connexion"
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons même quand la _fenêtre est active"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "Jouer les sons même lorsque vous êtes _absent"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "Commande"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3932,73 +3957,61 @@
 "_Commande à utiliser :\n"
 "(%s pour le nom de fichier)"
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "L'_envoi de message change le statut d'absence"
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "Mise en _attente des messages pendant l'absence"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "Réponse automatique"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "Secondes avant de _réenvoyer :"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "Envoyer une réponse automatique"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "Envoyer la réponse automatique _uniquement lorsque inactif"
 
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "Envoyer une réponse automatique dans les _conversations actives"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "Inactif"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "_Temps d'inactivité affiché :"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Utilisation de Gaim"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "Utilisation de X"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "Utilisation de Windows"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "Se mettre absent _lorsque inactif"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "_Minutes avant de passer absent :"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "Me_ssages d'absence :"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4013,7 +4026,7 @@
 "<span weight=\"bold\">Page web : </span>\t%s\n"
 "<span weight=\"bold\">Fichier : </span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4028,108 +4041,104 @@
 "<span weight=\"bold\">URL : </span> %s\n"
 "<span weight=\"bold\">Fichier : </span> %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "Charger"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "Résumé"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "Détails"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "Charger un son"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2301
 msgid "Event"
 msgstr "Événement"
 
-#: src/gtkprefs.c:2321
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "Tester"
 
-#: src/gtkprefs.c:2325
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: src/gtkprefs.c:2329
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "_Editer"
 
+#: src/gtkprefs.c:2499
+msgid "Interface"
+msgstr "Interface"
+
 #: src/gtkprefs.c:2500
-msgid "Interface"
-msgstr "Interface"
+msgid "Smiley Themes"
+msgstr "Thèmes des frimousses"
 
 #: src/gtkprefs.c:2501
-msgid "Smiley Themes"
-msgstr "Thèmes des frimousses"
+msgid "Message Text"
+msgstr "Texte du message"
 
 #: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr "Polices"
-
-#: src/gtkprefs.c:2503
-msgid "Message Text"
-msgstr "Texte du message"
-
-#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2505
 msgid "IMs"
 msgstr "Messages"
 
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2507
 msgid "Network"
 msgstr "Réseau"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2513
 msgid "Logging"
 msgstr "Enregistrement"
 
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2514
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2515
 msgid "Sound Events"
 msgstr "Événements sonores"
 
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2516
 msgid "Away / Idle"
 msgstr "Absence/inactivité"
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2517
 msgid "Away Messages"
 msgstr "Messages d'absence"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "Protocoles"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4153,63 +4162,63 @@
 msgid "Block only the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "Filtres"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Les changements prennent effet immédiatement."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "Gérer les filtres pour :"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "Autoriser un utilisateur"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "Personne à autoriser"
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Saisissez le nom de l'utilisateur que vous autorisez à vous contacter"
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "Autoriser un utilisateur"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permettre à %s de vous contacter ?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Êtes-vous sûr de vouloir autoriser %s à vous contacter ?"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "Bloquer un utilisateur"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "Personne à bloquer"
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "Saisissez le nom de l'utilisateur que vous désirez bloquer"
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s ?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Êtes-vous sûr de vouloir bloquer %s ?"
@@ -4217,13 +4226,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "Oui"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "Non"
 
@@ -4231,24 +4242,17 @@
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"Vous n'avez pas de protocole disponible vous permettant d'afficher la liste "
-"des salons de discussion."
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "Liste des salons de discussion"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "Récupérer la _liste"
 
@@ -4292,12 +4296,12 @@
 msgid "Someone says your name in chat"
 msgstr "Quelqu'un dit votre nom dans la discussion"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Impossible de jouer le son : le fichier (%s) n'existe pas."
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4305,7 +4309,7 @@
 "Impossible de jouer les sons. La méthode de sons « Commande » a été choisie "
 "mais la ligne de commande est vide."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4314,11 +4318,11 @@
 "Impossible de jouer les sons. La commande de méthode de sons n'a pas pu être "
 "lancée : %s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "Impossible de sauver cette icône sur le disque"
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "Enregistrer l'icône"
 
@@ -4327,11 +4331,11 @@
 msgstr ""
 "<b><font color\"=red\">L'archiveur n'a pas de fonction de lecture</font></b>"
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4340,7 +4344,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4349,52 +4353,57 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossible de trouver le dossier des archives</b></"
 "font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossible de lire le fichier %s</b></font>"
 
-#: src/log.c:661
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "Texte en clair"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "Veuillez créer un compte"
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Connexion"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Pseudo :</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>Mot de passe :</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Connexion"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>_Compte :</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>Mot de _passe :</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "_Comptes"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "_Préférences"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4428,12 +4437,12 @@
 "  -h, --help          affiche ce message d'aide\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. « %s -h » pour plus d'informations.\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4442,11 +4451,11 @@
 "Le plugin dépendant %s est introuvable. Veuillez installer ce plugin et "
 "recommencer."
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "Impossible de charger le plugin"
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Le plugin dépendant %s n'a pas pu être chargé."
@@ -4456,12 +4465,12 @@
 msgstr "Défaut peu original"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:378 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2771
 msgid "Available"
 msgstr "Disponible"
 
@@ -4473,12 +4482,12 @@
 msgid "Away for friends only"
 msgstr "Absent pour les amis seulement"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4494,7 +4503,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Impossible de résoudre le nom de l'hôte"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "Impossible de se connecter au server"
 
@@ -4521,173 +4530,174 @@
 msgid "Unknown Error Code."
 msgstr "Code d'erreur inconnu"
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "Status : %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:414
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
+#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
+#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
+#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Impossible de se connecter"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "Lecture de données"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "Poignée de main"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "Lecture de la clef du serveur"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "Échange de la clef de hashage"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "Erreur critique dans la bibliothèque GG\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connexion à %s échouée"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "Impossible de pinger le server"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "Envoyer comme message"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "Résolution du serveur GG"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "l'UIN Gadu-Gadu spécifié est non valide"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:769
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Vous essayez d'envoyer un message à un UIN Gadu-Gadu non valide"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "Impossible d'obtenir les résultats de la recherche"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Moteur de recherche de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "Actif"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Prénom"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "Sexe"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Localité"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
+#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "Informations sur le contact"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:950
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Il n'y a pas de liste de contacts stockée sur le serveur"
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Impossible d'importer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Liste de contacts transférée sur le serveur avec succès"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Impossible de transférer la liste de contacts sur le serveur"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Liste de contacts effacée du serveur avec succès"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Impossible d'effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "Changement de mot de passe effectué"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "Impossible de changer le mot de passe"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Erreur de communication avec le serveur Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4695,11 +4705,11 @@
 "Impossible de communiquer avec le serveur HTTP Gadu-Gadu. Veuillez réessayer "
 "plus tard."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Impossible d'importer la liste de contacts Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4707,37 +4717,37 @@
 "Impossible de se connecter au serveur de listes de contacts Gadu-Gadu. "
 "Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "Impossible d'exporter la liste de contacts"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Impossible de se connecter au serveur de listes de contacts Gadu-Gadu. "
 "Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Impossible d'effacer la liste de contacts"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "Impossible d'accéder à l'annuaire"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 "Impossible de se connecter au serveur annuaire. Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Impossible de changer le mot de passe Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4745,32 +4755,33 @@
 "Impossible de se connecter au serveur Gadu-Gadu. Veuillez réessayer plus "
 "tard."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "Recherche dans l'annuaire"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
+#: src/protocols/toc/toc.c:1558
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "Importer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "Exporter la liste de contacts vers le serveur"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "Impossible d'accéder au profil utilisateur"
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1461
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4788,7 +4799,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
@@ -4802,16 +4813,16 @@
 msgstr "L'utilisateur %s (%s%s%s%s%s) veut que vous l'autorisiez."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorize"
 msgstr "Autoriser"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:6060
 msgid "Deny"
 msgstr "Refuser"
 
@@ -4873,63 +4884,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "Impossible d'ouvrir un port en écoute"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Erreur à l'affichage du message du jour"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "Message du jour non disponible"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "Il n'y a pas de message du jour associé à cette connexion"
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "Voir le message du jour"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: src/protocols/yahoo/yahoo.c:2456
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
-msgstr "_Canal :"
-
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+msgstr "_Salon :"
+
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les surnoms IRC ne peuvent pas avoir d'espace"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
 #, c-format
 msgid "Signon: %s"
 msgstr "Connexion : %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "Impossible de créer le socket"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+msgid "Couldn't connect to host"
+msgstr "Impossible de se connecter à l'hôte"
+
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "Sujet"
 
@@ -4942,32 +4961,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "Serveur"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
-msgstr "_Port"
-
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "Codage"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "Utilisateur"
 
@@ -4992,7 +5013,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifié)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo.c:3058
 msgid "Realname"
 msgstr "Nom réel"
 
@@ -5041,88 +5063,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim a envoyé un message que le serveur IRC ne comprend pas"
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:404
 msgid "No such channel"
-msgstr "Le canal n'existe pas"
+msgstr "Ce salon n'existe pas"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:415
 msgid "no such channel"
-msgstr "Le canal n'existe pas"
-
-#: src/protocols/irc/msgs.c:417
+msgstr "Ce salon n'existe pas"
+
+#: src/protocols/irc/msgs.c:418
 msgid "User is not logged in"
 msgstr "Utilisateur non connecté"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:423
 msgid "No such nick or channel"
-msgstr "Le pseudo ou canal n'existe pas"
-
-#: src/protocols/irc/msgs.c:442
+msgstr "Ce pseudo ou salon n'existe pas"
+
+#: src/protocols/irc/msgs.c:443
 msgid "Could not send"
 msgstr "Impossible d'envoyer"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:499
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joindre %s nécessite une invitation"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vous avez été expulsé par %s (%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:601
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsé par %s (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) par %s"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:701
 msgid "Could not change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Cannot change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:723
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "Vous avez quitté le canal%s%s"
-
-#: src/protocols/irc/msgs.c:762
+msgstr "Vous avez quitté le salon %s%s"
+
+#: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
 msgstr "PONG non valide du serveur"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Réponse au PING -- Lag : %lu secondes"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:840
 #, c-format
 msgid "Cannot join %s:"
-msgstr "Impossible de joindre le canal %s :"
-
-#: src/protocols/irc/msgs.c:840
+msgstr "Impossible de joindre le salon %s :"
+
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
-msgstr "Impossible de joindre le canal"
-
-#: src/protocols/irc/msgs.c:870
+msgstr "Impossible d'entrer dans le salon"
+
+#: src/protocols/irc/msgs.c:871
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5130,22 +5152,22 @@
 "(Erreur de conversion du message. Vérifiez les options de codage dans les "
 "options du compte)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de réponse de %s : %lu secondes"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "CTCP PING reply"
 msgstr "Réponse au CTCP PING"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
+#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
 msgid "Disconnected."
 msgstr "Déconnecté"
 
@@ -5181,90 +5203,96 @@
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "Localité"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "Région"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "Code postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Pays"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
-msgstr "Email"
-
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+msgstr "Courrier électronique"
+
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "Service"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
 msgid "Title"
 msgstr "Titre"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "Rôle"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4839
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Éditer la carte de visite Jabber"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5272,64 +5300,70 @@
 "Tous les champs ci-dessous sont facultatifs. Saisissez uniquement les "
 "informations que vous désirez."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Identifiant Jabber"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Status"
 msgstr "État"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr "Ressource"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Profil Jabber"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:961
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
@@ -5427,25 +5461,9 @@
 msgstr "Erreur à l'initialisation de la session"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
@@ -5453,379 +5471,380 @@
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:322
 msgid "Connection Failed"
 msgstr "Échec de la connexion"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:325
 msgid "SSL Handshake Failed"
 msgstr "Échec de la poignée de main SSL"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber non valide"
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:431
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:601
 msgid "E-Mail"
-msgstr "Email"
+msgstr "Courriel"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
+#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "État"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "Téléphone"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:651
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:659
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
 "compte"
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
 msgid "Register New Jabber Account"
 msgstr "Enregistrer un nouveau compte Jabber"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
+#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:784
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:790
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:799
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:910
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: src/protocols/jabber/jabber.c:907
-msgid "From (To pending)"
-msgstr "Source (Destination en attente)"
-
-#: src/protocols/jabber/jabber.c:909
-msgid "From"
-msgstr "Source"
-
 #: src/protocols/jabber/jabber.c:912
+msgid "From (To pending)"
+msgstr "Source (Destination en attente)"
+
+#: src/protocols/jabber/jabber.c:914
+msgid "From"
+msgstr "Source"
+
+#: src/protocols/jabber/jabber.c:917
 msgid "To"
 msgstr "Destination"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:919
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:923
 msgid "Subscription"
 msgstr "Inscription"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:943
 msgid "Error"
 msgstr "Erreur"
 
 # Repris du fr.po de gabber
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Bavard"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6622
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:976
 msgid "Password Changed"
 msgstr "Mot de passe changé"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:977
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "Changer de mot de passe Jabber"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
 msgid "Set User Info"
 msgstr "Éditer les informations"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1136
 msgid "Bad Request"
 msgstr "Mauvaise requête"
 
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1138
 msgid "Conflict"
 msgstr "Conflit"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1140
 msgid "Feature Not Implemented"
 msgstr "Fonction non implémentée"
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1142
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1144
 msgid "Gone"
 msgstr "Parti"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "Item non trouvé"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "Identifiant Jabber malformé"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "Non autorisé"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1158
 msgid "Payment Required"
 msgstr "Paiement nécessaire"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1160
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1164
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1166
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouvé"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1170
 msgid "Server Overloaded"
 msgstr "Serveur surchargé"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1174
 msgid "Subscription Required"
 msgstr "Inscription nécessaire"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1176
 msgid "Unexpected Request"
 msgstr "Requête non attendue"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1183
 msgid "Authorization Aborted"
 msgstr "Autorisation annulée"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1185
 msgid "Incorrect encoding in authorization"
 msgstr "Encodage incorrect de l'Autorisation"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: src/protocols/jabber/jabber.c:1188
-msgid "Invalid Authorization Mechanism"
-msgstr "Mécanisme d'autorisation non valide"
-
 #: src/protocols/jabber/jabber.c:1191
+msgid "Invalid Authorization Mechanism"
+msgstr "Mécanisme d'autorisation non valide"
+
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "Mécanisme d'autorisation trop faible"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1199
 msgid "Temporary Authentication Failure"
 msgstr "Échec temporaire de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1201
 msgid "Authentication Failure"
 msgstr "Échec de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1205
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais préfixe de nom de domaine"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "Conflit de resource"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1214
 msgid "Host Gone"
 msgstr "Hôte perdu"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Unknown"
 msgstr "Hôte inconnu"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "Hôtes non correspondants"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1232
 msgid "Policy Violation"
 msgstr "Violation des règles"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1234
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1236
 msgid "Resource Constraint"
 msgstr "Limitation sur la resource"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1238
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "Voir l'autre hôte"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "Arrêt du systême"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "Condition non définie"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Encoding"
 msgstr "Codage de caractère non supporté"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non supporté"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Version"
 msgstr "Version non supportée"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1252
 msgid "XML Not Well Formed"
 msgstr "XML mal formé"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "Cacher le système d'exploitation"
 
@@ -5840,23 +5859,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin pour le protocole Jabber"
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "Utiliser TLS si possible"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "Forcer l'ancien SSL"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentication en clair pour les flux cryptés"
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "Connexion au serveur"
 
@@ -5932,30 +5952,30 @@
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arrivée dans la discussion %s"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, cet utilisateur ne supporte pas les "
 "transferts de fichiers"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "Échec d'envoi de fichier"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
 msgid "Unable to request USR\n"
 msgstr "Impossible de demander USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
 msgid "Unable to login using MD5"
 msgstr "Impossible de se connecter en utilisant MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
 msgid "Unable to send USR"
 msgstr "Impossible d'envoyer USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
 msgid "Requesting to send password"
 msgstr "Demande pour envoyer le mot de passe"
 
@@ -5963,11 +5983,11 @@
 msgid "Protocol version not supported"
 msgstr "Version du protocole non supportée"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
 msgid "Unable to request CVR\n"
 msgstr "Impossible de demander CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to request INF\n"
 msgstr "Impossible de demander INF\n"
 
@@ -5983,12 +6003,11 @@
 msgid "Unable to parse message."
 msgstr "Impossible d'interprêter le message"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
+#: src/protocols/msn/dispatch.c:232
 msgid "Unable to write to server"
 msgstr "Impossible de parler au server"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
 msgid "Syncing with server"
 msgstr "Synchronisation avec le serveur"
 
@@ -6040,7 +6059,7 @@
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "L'utilisateur est déconnecté"
 
@@ -6092,7 +6111,7 @@
 msgid "Too many hits to a FND"
 msgstr "Trop de réponses sur un FND"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "Non connecté"
 
@@ -6149,7 +6168,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Les paramêtres CVR sont inconnus ou interdits"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
 msgid "Unable to write"
 msgstr "Impossible d'écrire"
 
@@ -6185,8 +6204,8 @@
 msgid "Server too busy"
 msgstr "Serveur occupé"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
@@ -6220,19 +6239,19 @@
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN : %s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:190
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Nom sous lequel les utilisateurs MSN vous verront."
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "Numéro de téléphone"
 
@@ -6240,15 +6259,15 @@
 msgid "Set your work phone number."
 msgstr "Numéro au travail"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "Numéro de portable"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "Autoriser les messages portable MSN ?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:238
 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?"
@@ -6256,91 +6275,92 @@
 "Voulez-vous autorisez les contacts de votre liste à vous envoyer des "
 "messages MSN sur portable ?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "Interdire"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un portable"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "Bipper"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Absent"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
 msgid "Be Right Back"
 msgstr "Revient de suite"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
 msgid "On The Phone"
 msgstr "Au téléphone"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
 msgid "Out To Lunch"
 msgstr "Parti manger"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "Changer l'alias"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "Numéro de téléphone"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "Numéro au travail"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "Numéro de portable"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "Activation du service pour portables"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Autorisation pour les messages sur portable"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "Envoyer vers un portable"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "Lancer une discussion"
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:482
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6349,7 +6369,7 @@
 "bibliothèque SSL. Visitez http://gaim.sf.net/faq-ssl.php pour plus "
 "d'informations."
 
-#: src/protocols/msn/msn.c:785
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6359,11 +6379,11 @@
 "probablement dire « %s@hotmail.com ». La liste de permissions n'a pas été "
 "modifiée."
 
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "Pseudo MSN non valide"
 
-#: src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6373,82 +6393,82 @@
 "probablement dire « %s@hotmail.com ». La liste d'interdictions n'a pas été "
 "modifiée."
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 "<html><body><b>Erreur lors de la récupération du profil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3066
 msgid "Age"
 msgstr "Âge"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "Gender"
 msgstr "Genre"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "Status marital"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "Localisation"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
+#: src/protocols/msn/msn.c:1452
 msgid "A Little About Me"
 msgstr "À propos de moi"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
+#: src/protocols/yahoo/yahoo.c:3113
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Page web"
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Les informations sur %s ne sont pas disponibles"
 
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
 msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
 msgstr "Afficher les notifications de fin de conversation"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "Afficher les notifications de dépassement de temps"
 
@@ -6463,15 +6483,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Serveur de connexion"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
@@ -6491,43 +6511,39 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "Erreur inconnue lors de l'authentification au serveur MSN"
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Récupération de la liste de contacts"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "Impossible d'envoyer le mot de passe"
-
-#: src/protocols/msn/notification.c:397
+#: src/protocols/msn/notification.c:355
 msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:386
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Vous avez été déconnecté. Vous vous êtes connecté depuis un autre endroit."
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:392
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Vous avez été déconnecté. Les serveurs MSN sont coupés temporairement."
 
-#: src/protocols/msn/notification.c:584
+#: src/protocols/msn/notification.c:527
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s (%s) veut ajouter %s à sa liste de contacts"
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "L'utilisateur %s (%s) veut vous ajouter à sa liste de contacts"
 
-#: src/protocols/msn/notification.c:1362
+#: src/protocols/msn/notification.c:1351
 #, c-format
 msgid ""
 "Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
@@ -6536,11 +6552,11 @@
 "Votre liste de contacts MSN pour %s est temporairement non disponible. "
 "Veuillez patienter un moment et réessayer."
 
-#: src/protocols/msn/notification.c:1607
+#: src/protocols/msn/notification.c:1612
 msgid "Unable to transfer to notification server"
 msgstr "Impossible de parler au server de notification"
 
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1799
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6569,60 +6585,80 @@
 "\n"
 "Une fois la maintenance effectuée, vous pourrez vous reconnecter."
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "Erreur d'entrée/sortie"
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/servconn.c:210
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "Impossible de se connecter au server %s"
+
+#: src/protocols/msn/servconn.c:214
+#, c-format
+msgid "Error writing to %s server"
+msgstr "Erreur à l'écriture vers le serveur %s"
+
+#: src/protocols/msn/servconn.c:218
+#, c-format
+msgid ""
+"Error reading from %s server. Lastcommand was:\n"
+" %s"
+msgstr ""
+"Erreur à la lecture depuis le serveur %s.La dernière commande était :\n"
+" %s"
+
+#: src/protocols/msn/servconn.c:222
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "Erreur inconnu du serveur %s"
+
+#: src/protocols/msn/servconn.c:315
 msgid "Received HTTP error. Please report this."
 msgstr "Réception d'une erreur HTTP. Veuillez la reporter."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "La conversation est devenue inactive ou a été coupée"
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:130
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s a fermé sa fenêtre de dialogue"
 
-#: src/protocols/msn/switchboard.c:300
+#: src/protocols/msn/switchboard.c:264
 msgid "An MSN message may not have been received."
 msgstr "Un message MSN peut avoir été perdu."
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "Impossible de lire l'entête depuis le serveur"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr ""
-"Impossible de lire le message depuis le serveur. La commande est %hd, sa "
-"longueur est %hd."
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:243
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr ""
+"Impossible de lire le message depuis le serveur : %s. "
+"La commande est %hd, sa longueur est %hd."
+
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "utilisateurs : %s, fichiers : %s, taille : %sGo"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Impossible d'ajouter « %s » à vos favoris Napster"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "Vous avez été déconnecté du serveur"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s a demandé vos informations"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -6631,17 +6667,13 @@
 "endroit."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s a demandé un PING"
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Infos"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1274
 msgid "_Group:"
 msgstr "_Groupe :"
 
@@ -6656,74 +6688,239 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin pour le protocole NAPSTER"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:225
-#, fuzzy, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "Impossible d'envoyer le message : trop gros"
-
-#: src/protocols/novell/novell.c:371
-#, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "Impossible d'ajouter « %s » à vos favoris Napster"
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "Les paramêtres nécessaires n'ont pas été passés"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "Impossible d'écrire sur le réseau"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "Impossible de lire depuis le réseau"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "Erreur de communication avec le serveur"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "Conférence non trouvée"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "Cette conférence n'existe pas"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "Un dossier avec ce nom existe déjà"
+
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "Non supporté"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "Le mot de passe a expiré"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "Mot de passe non valide"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "Utilisateur non trouvé"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "Le compté a été désactivé"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "Le serveur ne peut pas accéder à l'annuaire"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "Votre administrateur a désactivé cette commande"
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "Le serveur est non disponible. Veuillez réessayer plus tard."
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Impossible d'ajouter un contact deux fois dans le même dossier"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "Impossible de s'ajouter en tant que contact"
+
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "L'archive principale est mal configurée"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "Nom d'utilisateur ou mot de passe non valide"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "Impossible de reconnaître le nom d'hôte ou d'utilisateur saisi"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+"Votre compte a été désactivé à cause d'un trop grand nombre de mots de "
+"passe saisis incorrects."
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Impossible d'ajouter deux fois la même personne dans une conversation"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Nombre maximum de contacts dans la liste atteint"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "Nom d'utilisateur saisi non valide"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "Erreur lors de la mise à jour de l'annuaire"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "Version du protocole incompatible"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "L'utilisateur vous a bloqué"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Cette version d'évaluation n'autorise pas plus de dix utilisateurs connectés "
+"à un instant."
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "L'utilisateur est déconnecté ou vous bloque"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Erreur inconnue :0x%X"
+
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Échec à la connexion (%s)"
+
+#: src/protocols/novell/novell.c:232
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+"Impossible d'envoyer le message. Impossible de récupérer des informations "
+"sur l'utilisateur (%s)."
+
+#: src/protocols/novell/novell.c:378
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Impossible d'ajouter %s à la liste de contacts (%s)"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, fuzzy, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "Impossible d'envoyer le message"
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:489
-#, fuzzy, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "Impossible d'envoyer le message : trop gros"
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Impossible d'envoyer le message (%s)"
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Impossible d'inviter l'utilisateur (%s)"
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+"Impossible d'envoyer le message à %s. Impossible de créer la conférence (%s)"
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+"Impossible d'envoyer le message. Impossible de créer la conférence (%s)"
+
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr ""
+"Impossible de déplacer l'utilisateur %s vers le dossier %s sur la liste du "
+"serveur. Erreur lors de la création du dossier (%s)"
+
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, fuzzy, c-format
-msgid "GroupWise Conference %d"
-msgstr "Lancer une conférence"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
-#, fuzzy
+"list (%s)."
+msgstr ""
+"Impossible d'ajouter %s à la liste de contacts. Erreur lors de la création "
+"du dossier sur la liste du serveur (%s)."
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Impossible de récupérer des informations sur l'utilisateur %s (%s)"
+
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Impossible d'ajouter l'utilisateur à la liste de filtre (%s)"
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Impossible d'ajouter %s à la liste d'interdiction (%s)"
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Impossible d'ajouter %s à la liste d'autorisation (%s)"
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Impossible de supprimer %s de la liste de filtre (%s)"
+
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Impossible de changer la configuration du filtre sur le serveur (%s)"
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Impossible de créer la conférence (%s)"
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
-msgstr "Erreur de communication avec le serveur Gadu-Gadu"
-
-#: src/protocols/novell/novell.c:982
-#, fuzzy
+msgstr "Erreur de communication avec le serveur. Fermeture de la connexion."
+
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
-msgstr "Utilisateurs"
+msgstr "Id utilisateur"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6732,109 +6929,108 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
-#, fuzzy
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/protocols/novell/novell.c:1016
-#, fuzzy
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
-msgstr "Options de l'utilisateur"
-
-#: src/protocols/novell/novell.c:1084
-#, fuzzy
+msgstr "Propriétés de l'utilisateur"
+
+#: src/protocols/novell/novell.c:1566
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "Conférence GroupWise %d"
+
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
-msgstr "Impossible de se connecter au server"
-
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
-#, fuzzy
+msgstr "Impossible de créer une connexion SSL vers le serveur"
+
+#: src/protocols/novell/novell.c:1621
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "Erreur à la réception d'un événement ou réponse (%s)"
+
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
-msgstr "Authentification"
-
-#: src/protocols/novell/novell.c:1162
-#, fuzzy
+msgstr "Authentification en cours..."
+
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "En attente de réponse..."
 
-#: src/protocols/novell/novell.c:1302
-#, fuzzy
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s a reçu une invitation pour cette conversation."
+
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
-msgstr "Sauver la conversation"
-
-#: src/protocols/novell/novell.c:1303
+msgstr "Invitation à la conversation"
+
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1305
-#, fuzzy
+"Invitation de : %s\n"
+"\n"
+"Envoyé : %s"
+
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
-msgstr "Voulez-vous l'écraser ?"
-
-#: src/protocols/novell/novell.c:1408
-#, fuzzy
+msgstr "Voulez-vous joindre la conversation ?"
+
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
 "endroit."
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr ""
+msgstr "%s est déconnecté et n'a pas reçu le message que vous venez d'envoyer."
 
 #. 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:1560
-#, fuzzy
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "Saisissez le nom de l'utilisateur que vous désirez bloquer"
-
-#: src/protocols/novell/novell.c:1582
+msgstr ""
+"Impossible de se connecter au serveur. Veuillez entrer l'adresse du serveur "
+"sur lequel vous voulez vous connecter."
+
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1846
+msgstr "Support SSL non installé"
+
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
-
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgstr "Cette conférence est fermée. Aucun message ne peut être envoyé."
+
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2168
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>%s :</b> %s"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
-#, fuzzy
+#: src/protocols/novell/novell.c:2743
+msgid "Message"
+msgstr "Message"
+
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
-msgstr "Déconnecté"
+msgstr "Invisible"
+
+#: src/protocols/novell/novell.c:3291
+msgid "Initiate _Chat"
+msgstr "Lancer une _discussion"
 
 #. *< api_version
 #. *< type
@@ -6847,255 +7043,290 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2428
-#, fuzzy
+msgstr "Plugin pour le protocole Novell GroupWise"
+
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
-msgstr "Adresse"
-
-#: src/protocols/novell/novell.c:2432
-#, fuzzy
+msgstr "Hôte du serveur"
+
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
-msgstr "Serveur"
-
-#: src/protocols/oscar/oscar.c:182
+msgstr "Port du serveur"
+
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "Erreur non valide"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "SNAC non valide"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "Fréquence vers l'hôte"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "Fréquence vers le client"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "Service non disponible"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "Service non défini"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:193
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolète"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by host"
 msgstr "Non supporté par l'hôte"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:195
 msgid "Not supported by client"
 msgstr "Non supporté par le client"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:196
 msgid "Refused by client"
 msgstr "Refusé par le client"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:197
 msgid "Reply too big"
 msgstr "Réponse trop grosse"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:198
 msgid "Responses lost"
 msgstr "Réponses perdues"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:199
 msgid "Request denied"
 msgstr "Requête refusée"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:200
 msgid "Busted SNAC payload"
 msgstr "Charge SNAC incorrecte"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "Insufficient rights"
 msgstr "Droits insuffisants"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "In local permit/deny"
 msgstr "Dans l'autorisation/interdiction locale"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (sender)"
 msgstr "Trop méchant (envoyeur)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "Trop méchant (destinataire)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "L'utilisateur est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "Aucun résultat"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "Dépassement de liste"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "Requête ambiguë"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "File d'attente pleine"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "Voix"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "Connexion directe AIM"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "Discussion"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "Jeux"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "Modules"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "Connexion directe ICQ"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "Relai de serveur ICQ"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "Ancien ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Chiffrement Trillian"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
 msgstr "Sécurité activée"
 
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "Visioconférence"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "Vidéo iChat"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6625
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:6623
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:6624
 msgid "Occupied"
 msgstr "Occupé"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "Sur internet"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "Possibilités"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Connexion directe avec %s fermée"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Échec de la connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "Échec de la connexion directe"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "Connexion directe avec %s établie"
+
+#: src/protocols/oscar/oscar.c:906
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "Tentative de connexion directe pour message vers %s à %s:%hu"
+
+#: src/protocols/oscar/oscar.c:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Demande à %s de se connecter directement à %s:%hu pour le message"
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "Impossible d'ouvrir une connexion directe"
+
+#: src/protocols/oscar/oscar.c:1362
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Connexion directe avec %s"
+
+#: src/protocols/oscar/oscar.c:1366
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Cela révèle votre adresse IP et peut être considéré comme une faille de "
+"sécurité. Voulez-vous continuer ?"
+
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+msgid "Connect"
+msgstr "Connecter"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "Les discussions sont inaccessibles pour l'instant"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "Impossible de se connecter à l'hôte"
-
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "Pseudo envoyé"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7106,45 +7337,45 @@
 "pseudos doivent soit commencer par une lettre et contenir uniquement des "
 "lettres, des chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "Connexion établie, cookie envoyé"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "Impossible de créer une nouvelle connexion"
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "Impossible d'ouvrir le socket en attente de connexions"
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou mot de passe incorrect."
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:2001
 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."
@@ -7153,23 +7384,23 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "à jour sur %s"
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "Autorisation reçue"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7178,29 +7409,24 @@
 "Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
 "Regardez %s pour plus d'informations."
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM."
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Impossible de récupérer un code de connexion valide."
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Connexion directe avec %s établie"
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
 msgid "(There was an error receiving this message)"
 msgstr "(Erreur pendant la réception de ce message)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:3282
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demande une connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:3285
 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 "
@@ -7210,23 +7436,19 @@
 "d'images. Votre adresse IP sera révélée et ceci peut être considéré comme "
 "une faille de sécurité."
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr "Connecter"
-
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:3321
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3329
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3330
 msgid "Please authorize me!"
 msgstr "Autorise moi, s'il te plaît !"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:3360
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7235,23 +7457,23 @@
 "L'ajout de l'utilisateur %s à votre liste de contacts nécessite une "
 "autorisation. Voulez-vous envoyer une demande d'autorisation ?"
 
-#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
 msgid "Request Authorization"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
+#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6097
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3423
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:3506
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7261,11 +7483,11 @@
 "suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3526
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7276,19 +7498,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:3527
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3534
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %u a accepté votre requête de le rajouter à votre liste de "
 "contacts."
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3542
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7301,7 +7523,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3550
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7314,7 +7536,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7327,20 +7549,20 @@
 "Le message est :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3585
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3589
 msgid "Decline"
 msgstr "Décliner"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3674
 #, 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."
@@ -7348,7 +7570,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3683
 #, 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."
@@ -7356,7 +7578,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3692
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7366,72 +7588,70 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3701
 #, 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] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3710
 #, 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] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3719
 #, 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] "Vous avez raté %hu message de %s pour des raisons inconnues."
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
-#: src/protocols/oscar/oscar.c:3189
+#: src/protocols/oscar/oscar.c:3780
 #, 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:3248
+#: src/protocols/oscar/oscar.c:3839
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a envoyé l'erreur : %s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3840
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3875
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Votre message pour %s n'a pas été envoyé :"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3934
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Les informations de %s ne sont pas disponibles :"
 
-#: src/protocols/oscar/oscar.c:3366
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3957
 msgid "Warning Level"
-msgstr "Afficher le niveau d'a_vertissement"
-
-#: src/protocols/oscar/oscar.c:3369
-#, fuzzy
+msgstr "Niveau d'avertissement"
+
+#: src/protocols/oscar/oscar.c:3960
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:4046
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:4232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7439,11 +7659,11 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4450
 msgid "Rate limiting error."
 msgstr "Erreur de limite de quota"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7451,7 +7671,7 @@
 "La dernière action n'a pas pu être effectuée car vous avez depassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:4514
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7459,109 +7679,113 @@
 "Vous avez été déconnecté. Vous vous êtes connecté avec ce pseudo depuis un "
 "autre endroit."
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:4516
 msgid "You have been signed off for an unknown reason."
 msgstr "Vous avez été déconnecté pour une raison inconnue."
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:4547
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
 msgid "Email Address"
 msgstr "Adresse électronique"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
 msgid "Mobile Phone"
 msgstr "Numéro de portable"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4830
+msgid "Not specified"
+msgstr "Non renseigné"
+
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Femme"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Homme"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4847
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4851
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4856
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4864
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4872
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4873
 msgid "Company"
 msgstr "Société"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4874
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4875
 msgid "Position"
 msgstr "Poste"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4877
 msgid "Web Page"
 msgstr "Page web"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4883
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informations ICQ pour %s :"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4933
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Les pseudos suivants sont associés a %s"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4958
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4998
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5026
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7570,7 +7794,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée diffère de l'originale."
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7579,7 +7803,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée se finit par une espace."
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7588,7 +7812,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée est trop longue"
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7597,7 +7821,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour ce pseudo."
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7606,7 +7830,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop de pseudos associés à cette adresse."
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7615,12 +7839,12 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7629,20 +7853,27 @@
 "Votre pseudo est actuellement affiché comme cela :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:5128
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
+"connexion directe pour envoyer des images."
+
+#: src/protocols/oscar/oscar.c:5301
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:5302
 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 "
@@ -7652,7 +7883,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7667,19 +7898,19 @@
 "La taille maximale de %d caractères du profil a été dépassée. Gaim l'a "
 "tronqué lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5334
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:5368
 msgid "Unable to set AIM away message."
 msgstr "Impossible de mettre le message d'absence AIM"
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7689,7 +7920,7 @@
 "connexion. Vous êtes toujours « En ligne. » Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:5409
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7704,11 +7935,11 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Gaim l'a tronqué lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5414
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:5500
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7720,16 +7951,16 @@
 "uniquement des lettres, des chiffres et des espaces, soit contenir "
 "uniquement des chiffres."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5931
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -7738,13 +7969,13 @@
 "Gaim n'a pas pu récupérer la liste de contacts des serveurs AIM. La liste de "
 "contacts n'est pas perdue et sera de nouveau disponible dans quelques temps."
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7753,11 +7984,11 @@
 "Impossible de rajouter le contact %s parce qu'il y a trop de contacts dans "
 "la liste. Supprimez un contact et réessayez."
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5930
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7768,7 +7999,7 @@
 "plus probable est que le nombre maximum de contact a été atteint dans votre "
 "liste de contacts."
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6012
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7777,11 +8008,11 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:6018
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6051
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7792,19 +8023,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6093
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %s a accepté votre demande de le rajouter à votre liste de "
 "contacts."
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6094
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6097
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7815,86 +8046,75 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6098
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:6157
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussion non valide"
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6247
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
+"d'images dans les discussions AIM."
+
+#: src/protocols/oscar/oscar.c:6404
 msgid "Away Message"
 msgstr "Message d'absence"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr "Impossible d'ouvrir une connexion directe"
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Connexion directe avec %s"
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Cela révèle votre adresse IP et peut être considéré comme une faille de "
-"sécurité. Voulez-vous continuer ?"
-
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6688
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6706
 msgid "Edit Buddy Comment"
 msgstr "Éditer le commentaire"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6712
 msgid "Get Status Msg"
 msgstr "Obtenir le status"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6724
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6747
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6777
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6778
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du pseudo permet uniquement de changer les majuscules "
 "et les espaces."
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6785
 msgid "New screen name formatting:"
 msgstr "Nouvel affichage pour le pseudo :"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6837
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6882
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6885
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6886
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7902,75 +8122,75 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic-droit du contact."
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6903
 msgid "Find Buddy by E-mail"
 msgstr "Chercher un contact par adresse électronique"
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6904
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse électronique"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6905
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6922
 msgid "Available Message:"
 msgstr "Message de disponibilité :"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6923
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Je travaille et j'espère une diversion. Dérangez-moi !"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7004
 msgid "Set User Info..."
 msgstr "Éditer les informations..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7009
 msgid "Set User Info (URL)..."
 msgstr "Éditer les informations (URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:7015
 msgid "Set Available Message..."
 msgstr "Changer le message de disponibilité..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7020
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7025
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:7029
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7038
 msgid "Format Screen Name..."
 msgstr "Changer l'affichage du pseudo..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:7042
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7046
 msgid "Display Currently Registered Address"
 msgstr "Afficher l'adresse enregistrée"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:7050
 msgid "Change Currently Registered Address..."
 msgstr "Changer l'adresse enregistrée..."
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7057
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:7063
 msgid "Search for Buddy by Email..."
 msgstr "Chercher par adresse électronique..."
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7068
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
@@ -7985,124 +8205,1132 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin pour le protocole AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7204
 msgid "Auth host"
 msgstr "Hôte d'authentification"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7209
 msgid "Auth port"
 msgstr "Port d'authentification"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
+#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "L'utilisateur %s n'est pas sur le réseau"
+
+#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
+#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+msgid "Key Agreement"
+msgstr "Accord de clef"
+
+#: src/protocols/silc/buddy.c:49
+msgid "Cannot perform the key agreement"
+msgstr "Impossible d'effectuer l'accord de clef"
+
+#: src/protocols/silc/buddy.c:106
+msgid "Error occurred during key agreement"
+msgstr "Erreur pendant l'accord de clef"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Key Agreement failed"
+msgstr "Échec de l'accord de clef"
+
+#: src/protocols/silc/buddy.c:115
+msgid "Timeout during key agreement"
+msgstr "Connexion morte pendant l'accord de clef"
+
+#: src/protocols/silc/buddy.c:120
+msgid "Key agreement was aborted"
+msgstr "Annulation de l'accord de clef"
+
+#: src/protocols/silc/buddy.c:125
+msgid "Key agreement is already started"
+msgstr "Accord de clef déja commencé"
+
+#: src/protocols/silc/buddy.c:130
+msgid "Key agreement cannot be started with yourself"
+msgstr "L'accord de clef ne peut pas se faire sur soi-même"
+
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
+#: src/protocols/silc/buddy.c:500
+msgid "The remote user is not present in the network any more"
+msgstr "Le correspondant n'est plus présent sur le réseau"
+
+#: src/protocols/silc/buddy.c:284
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr "Accord de clef demandé par %s. Voulez-vous établir cet accord ?"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Le correspondant attend un accord de clef sur :\n"
+"Hôte distant : %s\n"
+"Port distant : %d"
+
+#: src/protocols/silc/buddy.c:301
+msgid "Key Agreement Request"
+msgstr "Requête d'accord de clef"
+
+#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
+#: src/protocols/silc/buddy.c:451
+msgid "IM With Password"
+msgstr "Message avec mot de passe"
+
+#: src/protocols/silc/buddy.c:410
+msgid "Cannot set IM key"
+msgstr "Impossible de choisir la clef du message"
+
+#: src/protocols/silc/buddy.c:452
+msgid "Set IM Password"
+msgstr "Mot de passe du message"
+
+#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+msgid "Get Public Key"
+msgstr "Récupérer la clef publique"
+
+#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
+msgid "Cannot fetch the public key"
+msgstr "Impossible de récupérer la clef publique"
+
+#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+msgid "Show Public Key"
+msgstr "Afficher la clef publique"
+
+#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/chat.c:218
+msgid "Could not load public key"
+msgstr "Impossible de charger la clef publique"
+
+#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
+msgid "User Information"
+msgstr "Informations"
+
+#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+msgid "Cannot get user information"
+msgstr "Impossible de récupérer les informations"
+
+#: src/protocols/silc/buddy.c:722
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "%s n'est pas un contact de confiance"
+
+#: src/protocols/silc/buddy.c:725
+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 ""
+"Impossible de recevoir des notifications d'un contact avant d'importer sa "
+"clef publique. Utilisez « Récupérer clef publique » pour l'importer."
+
+#: src/protocols/silc/buddy.c:1025
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "Le contact %s n'est pas présent sur le réseau"
+
+#: src/protocols/silc/buddy.c:1028
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Vous devez importer la clef publique d'un contact pour pouvoir l'ajouter à "
+"la liste de contacts. Choisissez « Importer » pour ce faire."
+
+#: src/protocols/silc/buddy.c:1031
+msgid "Import..."
+msgstr "Importer..."
+
+#: src/protocols/silc/buddy.c:1118
+msgid "Select correct user"
+msgstr "Choisissez un des utilisateurs"
+
+#: src/protocols/silc/buddy.c:1120
+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 ""
+"Plusieurs utilisateurs ont la même clef publique. Choisissez l'utilisateur "
+"que vous voulez ajouter à la liste de contacts."
+
+#: src/protocols/silc/buddy.c:1122
+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 ""
+"Plusieurs utilisateurs ont le même nom. Choisissez l'utilisateur que vous "
+"voulez ajouter à la liste de contacts."
+
+#: src/protocols/silc/buddy.c:1396
+msgid "Detached"
+msgstr "Détaché"
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "Indisposé"
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "Réveillez-moi"
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "Hyperactif"
+
+#: src/protocols/silc/buddy.c:1408
+msgid "Robot"
+msgstr "Robot"
+
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/silc.c:606
+msgid "Happy"
+msgstr "Heureux"
+
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/silc.c:608
+msgid "Sad"
+msgstr "Triste"
+
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/silc.c:610
+msgid "Angry"
+msgstr "En colère"
+
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/silc.c:612
+msgid "Jealous"
+msgstr "Jaloux"
+
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/silc.c:614
+msgid "Ashamed"
+msgstr "Honteux"
+
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/silc.c:616
+msgid "Invincible"
+msgstr "Invincible"
+
+#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/silc.c:618
+msgid "In Love"
+msgstr "Amoureux"
+
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:620
+msgid "Sleepy"
+msgstr "Somnolant"
+
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:622
+msgid "Bored"
+msgstr "Ennuyé"
+
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/silc.c:624
+msgid "Excited"
+msgstr "Excité"
+
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/silc.c:626
+msgid "Anxious"
+msgstr "Anxieux"
+
+#: src/protocols/silc/buddy.c:1471
+msgid "Modes"
+msgstr "Modes"
+
+#: src/protocols/silc/buddy.c:1481
+msgid "Mood"
+msgstr "Humeur"
+
+#: src/protocols/silc/buddy.c:1511
+msgid "Status Text"
+msgstr "Texte de status"
+
+#: src/protocols/silc/buddy.c:1516
+msgid "Preferred Contact"
+msgstr "Méthodes de contact préférées"
+
+#: src/protocols/silc/buddy.c:1524
+msgid "Paging"
+msgstr "Bipeur"
+
+#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "Visioconférence"
+
+#: src/protocols/silc/buddy.c:1537
+msgid "Preferred Language"
+msgstr "Langue préférée"
+
+#: src/protocols/silc/buddy.c:1542
+msgid "Device"
+msgstr "Appareil"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Computer"
+msgstr "Ordinateur"
+
+#: src/protocols/silc/buddy.c:1548
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1550
+msgid "Terminal"
+msgstr "Terminal"
+
+#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+#: src/protocols/silc/buddy.c:1567
+msgid "Geolocation"
+msgstr "Localisation"
+
+#: src/protocols/silc/buddy.c:1626
+msgid "Reset IM Key"
+msgstr "Remise à zéro de la clef de message"
+
+#: src/protocols/silc/buddy.c:1631
+msgid "IM with Key Exchange"
+msgstr "Message avec échange de clef"
+
+#: src/protocols/silc/buddy.c:1635
+msgid "IM with Password"
+msgstr "Message avec mot de passe"
+
+#: src/protocols/silc/buddy.c:1646
+msgid "Get Public Key..."
+msgstr "Récupérer la clef publique..."
+
+#: src/protocols/silc/buddy.c:1651
+msgid "Send File..."
+msgstr "Envoyer un fichier..."
+
+#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+msgid "Kill User"
+msgstr "Tuer l'utilisateur"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "_Phrase clef :"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "Le salon %s n'existe pas sur le réseau"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
+msgid "Channel Information"
+msgstr "Informations du salon"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "Impossible de récupérer les informations du salon"
+
+#: src/protocols/silc/chat.c:217
+msgid "Add Channel Public Key"
+msgstr "Ajouter une clef publique au salon"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:272
+msgid "Open Public Key..."
+msgstr "Ouvrir clef publique..."
+
+#: src/protocols/silc/chat.c:383
+msgid "Channel Passphrase"
+msgstr "Phrase clef du salon"
+
+#: src/protocols/silc/chat.c:390
+msgid "Channel Public Keys List"
+msgstr "Clefs publiques du salon"
+
+#: src/protocols/silc/chat.c:395
+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 ""
+"L'authentification des salons est utilisée pour sécuriser le salon des accès "
+"non autorisés. L'authentification peut être par une phrase clef ou par des "
+"signatures numériques. Quand la phrase clef est utilisée, elle est "
+"nécessaire pour joindre le salon. Si des clefs publiques sont utilisées, "
+"seuls les utilisateurs de ces clefs peuvent joindre le salon."
+
+#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:873
+msgid "Channel Authentication"
+msgstr "Authentification du salon"
+
+#: src/protocols/silc/chat.c:562
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+msgid "Passphrase"
+msgstr "Phrase clef"
+
+#: src/protocols/silc/chat.c:577
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Saisissez le groupe privé et la phrase clef du salon %s"
+
+#: src/protocols/silc/chat.c:579
+msgid "Add Channel Private Group"
+msgstr "Ajouter un groupe privé au salon"
+
+#: src/protocols/silc/chat.c:706
+msgid "User Limit"
+msgstr "Limite d'utilisateurs"
+
+#: src/protocols/silc/chat.c:707
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"Nombre d'utilisateurs maximum du salon. Zéro pour ne pas mettre de limite."
+
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "Infos"
+
+#: src/protocols/silc/chat.c:856
+msgid "Invite List"
+msgstr "Liste d'invitations"
+
+#: src/protocols/silc/chat.c:860
+msgid "Ban List"
+msgstr "Liste des bannissements"
+
+#: src/protocols/silc/chat.c:867
+msgid "Add Private Group"
+msgstr "Nouveau groupe privé"
+
+#: src/protocols/silc/chat.c:878
+msgid "Reset Permanent"
+msgstr "Enlever le mode permanent"
+
+#: src/protocols/silc/chat.c:882
+msgid "Set Permanent"
+msgstr "Mettre le mode permanent"
+
+#: src/protocols/silc/chat.c:889
+msgid "Set User Limit"
+msgstr "Choisir la limite d'utilisateurs"
+
+#: src/protocols/silc/chat.c:894
+msgid "Reset Topic Restriction"
+msgstr "Enlever le mode sujet restreint"
+
+#: src/protocols/silc/chat.c:898
+msgid "Set Topic Restriction"
+msgstr "Mettre le mode sujet restreint"
+
+#: src/protocols/silc/chat.c:904
+msgid "Reset Private Channel"
+msgstr "Enlevet le mode privé"
+
+#: src/protocols/silc/chat.c:908
+msgid "Set Private Channel"
+msgstr "Mettre le mode privé"
+
+#: src/protocols/silc/chat.c:914
+msgid "Reset Secret Channel"
+msgstr "Enlever le mode secret"
+
+#: src/protocols/silc/chat.c:918
+msgid "Set Secret Channel"
+msgstr "Mettre le mode secret"
+
+#: src/protocols/silc/chat.c:988
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Vous avez fondé le salon sur <I>%s</I>"
+
+#: src/protocols/silc/chat.c:992
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
+
+#: src/protocols/silc/chat.c:1042
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"Vous devez entrer dans le salon %s avant de pouvoir intégrer le groupe privé"
+
+#: src/protocols/silc/chat.c:1044
+msgid "Join Private Group"
+msgstr "Joindre un groupe privé"
+
+#: src/protocols/silc/chat.c:1045
+msgid "Cannot join private group"
+msgstr "Impossible de joindre le groupe privé"
+
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+msgid "Cannot call command"
+msgstr "Impossible de lancer la commande"
+
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+msgid "Unknown command"
+msgstr "Commande inconnue"
+
+#: 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:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "Transfert de fichier sécurisé"
+
+#: 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 "Erreur pendant le transfert de fichier"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "Permission refusée"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "Échec de l'accord de clef"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "Session de transfert de fichier inexistante"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "Aucune session de transfert de fichier active"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "Transfert de fichier déjà commencé"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "Impossible de faire l'accord de clef pour le transfert de fichier"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "Impossible de commencer le transfert de fichier"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "Impossible d'envoyer le fichier"
+
+# c-format
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s a changé le sujet de <I>%s</I> en : %s"
+
+#: src/protocols/silc/ops.c:398
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Vous avez été expulsé de <I>%s</I> par <I>%s</I> (%s)"
+
+#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "Vous avez été tué par %s (%s)"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "Tué par %s (%s)"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "Déconnexion du serveur"
+
+#: src/protocols/silc/ops.c:767
+msgid "Personal Information"
+msgstr "Informations personnelles"
+
+#: src/protocols/silc/ops.c:790
+msgid "Birth Day"
+msgstr "Date de naissance"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "Position"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "Rôle"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "Organisation"
+
+#: src/protocols/silc/ops.c:806
+msgid "Unit"
+msgstr "Groupe"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "Courriel"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "Commentaire"
+
+#: src/protocols/silc/ops.c:878
+msgid "Join Chat"
+msgstr "Joindre une discussion"
+
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "Hôte"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "Mode utilisateur"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "Salons"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "Empreinte de clef publique"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "Babillage de clef publique"
+
+#: src/protocols/silc/ops.c:995
+msgid "More..."
+msgstr "Plus..."
+
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+msgid "Detach From Server"
+msgstr "Se détacher du serveur"
+
+#: src/protocols/silc/ops.c:1006
+msgid "Cannot detach"
+msgstr "Impossible de se détacher"
+
+#: src/protocols/silc/ops.c:1017
+msgid "Cannot set topic"
+msgstr "Impossible de changer le sujet"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Roomlist"
+msgstr "Liste des salons"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Cannot get room list"
+msgstr "Impossible de récupérer la liste des salons"
+
+#: src/protocols/silc/ops.c:1093
+msgid "No public key was received"
+msgstr "Aucune clef publique reçue"
+
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
+msgid "Server Information"
+msgstr "Informations du serveur"
+
+#: src/protocols/silc/ops.c:1107
+msgid "Cannot get server information"
+msgstr "Impossible de récupérer les informations du serveur"
+
+#: src/protocols/silc/ops.c:1128
+msgid "Could not kill user"
+msgstr "Impossible de tuer l'utilisateur"
+
+#: src/protocols/silc/ops.c:1205
+msgid "Error during connecting to SILC Server"
+msgstr "Erreur à la connexion au serveur SILC"
+
+#: src/protocols/silc/ops.c:1210
+msgid "Key Exchange failed"
+msgstr "Échec de l'échange de clef"
+
+#: src/protocols/silc/ops.c:1219
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
+"créer une nouvelle connexion."
+
+#: src/protocols/silc/ops.c:1254
+msgid "Disconnected by server"
+msgstr "Déconnexion par le serveur"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "Reprise de la session"
+
+#: src/protocols/silc/ops.c:1316
+msgid "Authenticating connection"
+msgstr "Authentification de la connexion"
+
+#: src/protocols/silc/ops.c:1363
+msgid "Verifying server public key"
+msgstr "Vérification de la clef publique du serveur"
+
+#: src/protocols/silc/ops.c:1404
+msgid "Passphrase required"
+msgstr "Phrase clef nécessaire"
+
+#: src/protocols/silc/ops.c:1433
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
+
+#: src/protocols/silc/ops.c:1436
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"Échec : le correspondant ne reconnaît pas ou ne fait pas confiance a votre "
+"clef publique"
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Échec : le correspondant ne supporte pas le groupe KE proposé"
+
+#: src/protocols/silc/ops.c:1442
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+"Échec : le correspondant ne supporte pas la méthode de chiffrement proposée"
+
+#: src/protocols/silc/ops.c:1445
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Échec : le correspondant ne supporte pas le PKCS proposé"
+
+#: src/protocols/silc/ops.c:1448
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+"Échec : le correspondant ne supporte pas la fonction de hashage proposée"
+
+#: src/protocols/silc/ops.c:1451
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Échec : le correspondant ne supporte pas le HMAC proposé"
+
+#: src/protocols/silc/ops.c:1453
+msgid "Failure: Incorrect signature"
+msgstr "Échec : signature incorrecte"
+
+#: src/protocols/silc/ops.c:1455
+msgid "Failure: Invalid cookie"
+msgstr "Échec : cookie invalide"
+
+#: src/protocols/silc/ops.c:1466
+msgid "Failure: Authentication failed"
+msgstr "Échec de l'authentification"
+
+#: 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?"
+msgstr ""
+"La clef reçue de %s ne correspond pas à votre copie locale de cette clef "
+"publique. Voulez-vous néanmoins accepter cette clef publique ?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "Voulez-vous acceptez la clef publique reçue de %s ?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"L'empreinte et le babillage pour la clef de %s sont :\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "Vérifier la clef publique"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "Voir..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "Type de clef publique non supporté"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "Échec de la connexion"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "Impossible d'initialiser la connexion client SILC"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "Échange de clef en cours"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "Pas assez de mémoire"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "Connexion au serveur SILC"
+
+#: src/protocols/silc/silc.c:602
+msgid "Your Current Mood"
+msgstr "Votre humeur actuelle"
+
+#: src/protocols/silc/silc.c:604
+msgid "Normal"
+msgstr "Normal"
+
+#: src/protocols/silc/silc.c:629
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Vos méthodes de contact préférées"
+
+#: src/protocols/silc/silc.c:646
+msgid "Your Current Status"
+msgstr "Votre état actuel"
+
+#: src/protocols/silc/silc.c:653
+msgid "Online Services"
+msgstr "Services en ligne"
+
+#: src/protocols/silc/silc.c:656
+msgid "Let others see what services you are using"
+msgstr "Publier les services utilisés"
+
+#: src/protocols/silc/silc.c:662
+msgid "Let others see what computer you are using"
+msgstr "Publier l'ordinateur utilisé"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your VCard File"
+msgstr "Votre carte de visite VCard"
+
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+msgid "User Online Status Attributes"
+msgstr "Attributs d'état"
+
+#: src/protocols/silc/silc.c:684
+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 ""
+"Vous pouvez autoriser les autres utilisateurs à voir votre état en ligne et "
+"vos informations personnelles. Veuillez saisir les informations que vous "
+"voulez publier."
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+msgid "Message of the Day"
+msgstr "Message du jour"
+
+#: src/protocols/silc/silc.c:723
+msgid "No Message of the Day available"
+msgstr "Message du jour non disponible"
+
+#: src/protocols/silc/silc.c:724
+msgid "There is no Message of the Day associated with this connection"
+msgstr "Il n'y a pas de message du jour associé à cette connexion"
+
+#: src/protocols/silc/silc.c:740
+msgid "Online Status"
+msgstr "Status"
+
+#: src/protocols/silc/silc.c:749
+msgid "View Message of the Day"
+msgstr "Voir le message du jour"
+
+#: src/protocols/silc/silc.c:813
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "<I>%s</I> n'est pas présent sur le réseau"
+
+#: src/protocols/silc/silc.c:907
+msgid "Instant Messages"
+msgstr "Messages"
+
+#: src/protocols/silc/silc.c:912
+msgid "Digitally sign all IM messages"
+msgstr "Signer numériquement tous les messages"
+
+#: src/protocols/silc/silc.c:917
+msgid "Verify all IM message signatures"
+msgstr "Vérifier la signature de tous les messages"
+
+#: src/protocols/silc/silc.c:920
+msgid "Channel Messages"
+msgstr "Discussions"
+
+#: src/protocols/silc/silc.c:925
+msgid "Digitally sign all channel messages"
+msgstr "Signer numériquement tous les messages des salons"
+
+#: src/protocols/silc/silc.c:930
+msgid "Verify all channel message signatures"
+msgstr "Vérifier la signature de tous les messages des salons"
+
+#: src/protocols/silc/silc.c:933
+msgid "Default SILC Key Pair"
+msgstr "Paire de clefs SILC par défaut"
+
+#: src/protocols/silc/silc.c:938
+msgid "SILC Public Key"
+msgstr "Clef publique"
+
+#: src/protocols/silc/silc.c:943
+msgid "SILC Private Key"
+msgstr "Clef privée"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1026
+msgid "SILC Protocol Plugin"
+msgstr "Plugin pour le protocole SILC"
+
+#. *  description
+#: src/protocols/silc/silc.c:1028
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Protocole de conférences instantanées sécurisées"
+
+#: src/protocols/silc/silc.c:1058
+msgid "Public key authentication"
+msgstr "Authentification par clef publique"
+
+#: src/protocols/silc/silc.c:1064
+msgid "Public Key File"
+msgstr "Fichier de clef publique"
+
+#: src/protocols/silc/silc.c:1068
+msgid "Private Key File"
+msgstr "Fichier de clef privée"
+
+#: src/protocols/silc/silc.c:1073
+msgid "Reject watching by other users"
+msgstr "Empêcher l'observation par les autres utilisateurs"
+
+#: src/protocols/silc/silc.c:1076
+msgid "Block invites"
+msgstr "Bloquer les invitations"
+
+#: src/protocols/silc/silc.c:1079
+msgid "Block IMs without Key Exchange"
+msgstr "Bloquer les messages sans échange de clef"
+
+#: src/protocols/silc/silc.c:1082
+msgid "Reject online status attribute requests"
+msgstr "Empêcher les requêtes d'attributs d'état"
+
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+msgid "Creating SILC key pair..."
+msgstr "Création de la paire de clefs SILC..."
+
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "Nom réel"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "Utilisateur"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "Nom d'hôte"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "Algorithme"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "Longueur de clef"
+
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+msgid "Public Key Information"
+msgstr "Informations sur la clef publique"
+
+#: src/protocols/toc/toc.c:166
 #, c-format
 msgid "Looking up %s"
 msgstr "Recherche de %s"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'écrire dans le fichier %s"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, les %s derniers caractères sont perdus."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les avertissements de %s ne sont pas autorisés."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un message a été perdu, vous dépassez la vitesse limite du serveur."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La discussion %s est inaccessible."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite à %s."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Vous avez raté un message de %s parce que le message était trop gros,"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Vous avez raté un message de %s parce qu'il a été envoyé trop vite."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:539
 msgid "Failure."
 msgstr "Échec"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:542
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:545
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:548
 msgid "Dir service temporarily unavailable."
 msgstr "L'annuaire est temporairement indisponible."
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 msgid "Email lookup restricted."
 msgstr "La recherche par adresse électronique est restreinte."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 msgid "Keyword ignored."
 msgstr "Mot clef ignoré"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:557
 msgid "No keywords."
 msgstr "Pas de mot-clef"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:560
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'informations personnelles."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:564
 msgid "Country not supported."
 msgstr "Pays non supporté"
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:567
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Échec inconnu : %s"
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:573
 msgid "The service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:576
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
 "puissiez vous connecter."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:579
 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."
@@ -8111,39 +9339,39 @@
 "et réessayez. Si vous persistez maintenant, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:581
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connexion : %s"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Une erreur inconnue (%d) s'est produite : %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:604
 msgid "Connection Closed"
 msgstr "Connexion terminée"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:644
 msgid "Waiting for reply..."
 msgstr "En attente de réponse..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:714
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
 "nouveau."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:902
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectué"
 
+#: src/protocols/toc/toc.c:906
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC a envoyé une commande PAUSE."
+
 #: src/protocols/toc/toc.c:907
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC a envoyé une commande PAUSE."
-
-#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -8153,45 +9381,45 @@
 "déconnecter si vous en envoyez un. Gaim empêchera ceci. Ce n'est que "
 "temporaire, soyez patient."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1417
 msgid "Get Dir Info"
 msgstr "Chercher dans l'annuaire"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1553
 msgid "Set Dir Info"
 msgstr "Changer les informations"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1675
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossible d'ouvrir %s pour l'écriture"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1711
 msgid "File transfer failed; other side probably canceled."
 msgstr "Échec du tranfert de fichier. Annulation probable du correspondant."
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
+#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
 msgid "Could not connect for transfer."
 msgstr "Impossible de se connecter pour le transfert"
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1953
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Impossible d'écrire l'entête de fichier. Le fichier n'est pas transmis."
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2053
 msgid "Gaim - Save As..."
 msgstr "Gaim - Enregistrer sous..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
 msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2094
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
@@ -8207,15 +9435,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2195
 msgid "TOC host"
 msgstr "Hôte TOC"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2199
 msgid "TOC port"
 msgstr "Port TOC"
 
@@ -8272,7 +9500,7 @@
 msgid "Profile"
 msgstr "Profil"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "Changer de profil"
 
@@ -8299,11 +9527,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin pour le protocole Trepia"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:307
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -8311,27 +9539,27 @@
 "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
 "endroit."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "Dring !"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:868
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "L'utilisateur %s a (rétroactivement) refusé votre demande de le rajouter à "
 "votre liste de contacts."
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:871
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8340,11 +9568,11 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1601
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8355,11 +9583,11 @@
 "Cette version de Gaim n'arrivera probablement pas à se connecter au service "
 "Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %s."
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1677
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8368,78 +9596,78 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "Nom d'utilisateur non valide"
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect"
 
-#: src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1719
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "Votre compte est blocké. Veuillez vous connecter par le site Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Code d'erreur inconnu %d"
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1779
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s"
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
 msgid "Unable to read"
 msgstr "Impossible de lire"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
+#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Not At Home"
 msgstr "Pas à la maison"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Not At Desk"
 msgstr "Pas au bureau"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2776
 msgid "Not In Office"
 msgstr "Pas au travail"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -8448,31 +9676,31 @@
 "\n"
 "<b>%s :</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "Joindre dans une discussion"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "Activer quelle identité ?"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "Joindre un utilisateur dans une discussion..."
 
-#: src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:2973
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -8480,7 +9708,7 @@
 "<b>Désolé, les profils marqués pour adultes ne sont pas supportés pour "
 "l'instant.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -8488,39 +9716,39 @@
 "Si vous voulez voir ce profil, vous devez ouvrir ce lien dans votre "
 "navigateur.<br>"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2996
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Désolé, les profils non anglophones ne sont pas supportés pour l'instant."
 "</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/yahoo/yahoo.c:3095
 msgid "Hobbies"
 msgstr "Passe-temps"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
 msgid "Latest News"
 msgstr "Dernières nouvelles"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
 msgstr "Page web"
 
-#: src/protocols/yahoo/yahoo.c:3076
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
 msgstr "Lien sympa 1"
 
-#: src/protocols/yahoo/yahoo.c:3080
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
 msgstr "Lien sympa 2"
 
-#: src/protocols/yahoo/yahoo.c:3082
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
 msgstr "Lien sympa 3"
 
@@ -8535,27 +9763,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "Hôte du pager"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "Hôte de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "URL de liste des salons de discussion"
 
@@ -8622,34 +9850,34 @@
 msgid "User Rooms"
 msgstr "Salon de discussion utilisateur"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilisateur :</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
+#: src/protocols/zephyr/zephyr.c:560
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias :</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisible ou déconnecté"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>À %s depuis %s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
 msgid "Anyone"
 msgstr "Tout le monde"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "Déjà connecté à Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8657,19 +9885,15 @@
 "Zephyr utilise le nom d'utilisateur système, il est donc impossible d'avoir "
 "plusieurs comptes en étant identifié sous le même nom d'utilisateur."
 
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr "ZLocalisation"
-
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1191
 msgid "_Class:"
 msgstr "_Classe :"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "_Instance :"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "_Destinataire :"
 
@@ -8684,39 +9908,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin pour le protocole Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "Exporter vers .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr "Exporter vers .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "Exposition"
 
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
+#: src/proxy.c:853
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"80"
-
-#: src/proxy.c:957
+"%d"
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erreur de connexion mandataire %d"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "Paramètres du serveur mandataire incorrects"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8730,66 +9955,66 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "Saisissez votre mot de passe"
 
-#: src/server.c:962
+#: src/server.c:917
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:976
+#: src/server.c:931
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1111 src/server.c:1121
 #, c-format
 msgid "%s logged in."
 msgstr "%s s'est connecté"
 
-#: src/server.c:1184
+#: src/server.c:1134
 #, c-format
 msgid "%s signed on"
 msgstr "%s vient de se connecter"
 
-#: src/server.c:1200
+#: src/server.c:1150
 #, c-format
 msgid "%s came back"
 msgstr "%s est de retour"
 
-#: src/server.c:1202
+#: src/server.c:1152
 #, c-format
 msgid "%s went away"
 msgstr "%s vient de passer absent"
 
-#: src/server.c:1217
+#: src/server.c:1167
 #, c-format
 msgid "%s became idle"
 msgstr "%s est devenu inactif"
 
-#: src/server.c:1231
+#: src/server.c:1181
 #, c-format
 msgid "%s became unidle"
 msgstr "%s n'est plus inactif"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1192 src/server.c:1200
 #, c-format
 msgid "%s logged out."
 msgstr "%s vient de se déconnecter"
 
-#: src/server.c:1267
+#: src/server.c:1214
 #, c-format
 msgid "%s signed off"
 msgstr "%s a quitté"
 
-#: src/server.c:1317
+#: src/server.c:1264
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8798,11 +10023,11 @@
 "%s vient de se faire réprimander par %s\n"
 "Votre nouveau niveau d'avertissement est de %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1267
 msgid "an anonymous person"
 msgstr "une personne anonyme"
 
-#: src/server.c:1430
+#: src/server.c:1377
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8811,12 +10036,12 @@
 "L'utilisateur %s invite %s dans le salon de discussions : %s\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1381
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "L'utilisateur %s invite %s dans le salon de discussions : %s\n"
 
-#: src/server.c:1440
+#: src/server.c:1387
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation à la discussion ?"
 
@@ -8843,33 +10068,33 @@
 msgid "_Warn"
 msgstr "_Réprimander"
 
-#: src/util.c:2040
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: src/util.c:2043
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2430
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003 : Erreur à l'ouverture de la connexion\n"
 
@@ -8885,11 +10110,53 @@
 msgid "Notification"
 msgstr "Annonce"
 
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "Nom d'utilisateur : <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "Niveau d'avertissement : <b>%d%%</b><br>\n"
+#~ msgid "Connection timeout"
+#~ msgstr "Connexion morte"
+
+#~ msgid "Buddy List Toolbar"
+#~ msgstr "Barre d'outils de la liste de contacts"
+
+#~ msgid "Group Display"
+#~ msgstr "Affichage des groupes"
+
+#~ msgid "Show _numbers in groups"
+#~ msgstr "Afficher le _nombre de contacts dans chaque groupe"
+
+#~ msgid "_Show people joining in window"
+#~ msgstr "Afficher les a_rrivées dans la fenêtre"
+
+#~ msgid "_Show people leaving in window"
+#~ msgstr "Afficher les _départs dans la fenêtre"
+
+#~ msgid "_Sending messages removes away status"
+#~ msgstr "L'_envoi de message change le statut d'absence"
+
+#~ msgid "Seconds before _resending:"
+#~ msgstr "Secondes avant de _réenvoyer :"
+
+#~ msgid "Warning: Passwords are stored in plain text!"
+#~ msgstr "Attention : les mots de passe sont sauvés en clair !"
+
+#~ msgid "Sign on"
+#~ msgstr "Connexion"
+
+#~ msgid "Style"
+#~ msgstr "Style"
+
+#~ msgid "Face"
+#~ msgstr "Police"
+
+#~ msgid "Color"
+#~ msgstr "Couleur"
+
+#~ msgid "_Text color"
+#~ msgstr "_Couleur de texte"
+
+#~ msgid "Bac_kground color"
+#~ msgstr "Couleur de f_ond"
+
+#~ msgid "Unable to send password"
+#~ msgstr "Impossible d'envoyer le mot de passe"
 
 #~ msgid "Online Since: <b>%s</b><br>\n"
 #~ msgstr "En ligne depuis : <b>%s</b><br>\n"
@@ -8897,15 +10164,6 @@
 #~ msgid "Member Since: <b>%s</b><br>\n"
 #~ msgstr "Membre depuis : <b>%s</b><br>\n"
 
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "Inactif : <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "Inactif : <b>Actif</b>"
-
-#~ msgid "Invalid Parameter (probably a Gaim bug)"
-#~ msgstr "Paramètre non valide (probablement un bug de Gaim)"
-
 #~ msgid "Disconnected"
 #~ msgstr "Déconnecté"
 
@@ -8921,12 +10179,6 @@
 #~ msgid "More Info"
 #~ msgstr "Plus d'informations"
 
-#~ msgid "Undisclosed"
-#~ msgstr "Non informé"
-
-#~ msgid "Private"
-#~ msgstr "Privé"
-
 #~ msgid "No Answer"
 #~ msgstr "Pas de réponse"
 
--- a/po/pt.po	Tue May 25 03:54:12 2004 +0000
+++ b/po/pt.po	Tue May 25 04:28:54 2004 +0000
@@ -1,5 +1,5 @@
 # Gaim Portuguese (Portugal) translation
-# Copyright (C) 2003-2004, Duarte Henriques <duarte_henriques@gawab.com>
+# Copyright (C) 2003-2004, Duarte Henriques <duarte_henriques@myrealbox.com>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
+"POT-Creation-Date: 2004-05-24 14:31-0400\n"
 "PO-Revision-Date: 2004-02-03 19:35+0000\n"
 "Last-Translator: Duarte Henriques<duarte_henriques@myrealbox.com>\n"
 "Language-Team: \n"
@@ -16,6 +16,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "Supressão de Mensagens de Erro"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "Esconder Erros de Desligar"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "Esconder Erros de Ligação"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -23,7 +35,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "Re-ligar Automaticamente"
 
@@ -31,7 +43,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Quando é desligado, este plugin liga-o de novo."
 
@@ -150,19 +162,21 @@
 msgid "New..."
 msgstr "Novo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Ausente"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
 msgid "Back"
 msgstr "De volta"
 
@@ -170,16 +184,15 @@
 msgid "Mute Sounds"
 msgstr "Não tocar sons"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "Transferências de ficheiros"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "Contas"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -267,16 +280,17 @@
 msgstr "URI do AIM inválido"
 
 #: plugins/gaim-remote/remote.c:651
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
-msgstr "Impossível guardar imagem: %s\n"
+msgstr ""
+"Falhei a atribuição de %s a um socket:\n"
+"%s"
 
 #: plugins/gaim-remote/remote.c:674
-#, fuzzy
 msgid "Unable to open socket"
-msgstr "Impossível ler do socket"
+msgstr "Impossível abrir socket"
 
 #. *< api_version
 #. *< type
@@ -400,15 +414,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
+#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "Nenhuma"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
+#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nome"
 
@@ -425,13 +439,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
 msgid "Search"
 msgstr "Pesquisa"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -469,29 +483,29 @@
 msgid "_Associate Buddy"
 msgstr "_Associar Contacto"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "Contactos"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:222
 msgid "Add to Address Book"
 msgstr "Adicionar ao Livro de Endereços"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:353
 msgid "Evolution Integration Configuration"
 msgstr "Configuração da Integração com Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:356
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Escolha todas as contas para as quais os contactos devem ser auto-"
 "adicionados."
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:386 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Conta"
 
@@ -502,7 +516,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:467
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -510,7 +524,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:470 plugins/gevolution/gevolution.c:472
 msgid "Provides integration with Ximian Evolution."
 msgstr "Fornece integração com o Ximian Evolution."
 
@@ -538,7 +552,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "Ícone do contacto"
 
@@ -554,15 +568,15 @@
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "Histórico"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra conversas gravadas recentemente em novas conversas."
-
-#: plugins/history.c:73
+msgstr "Mostra conversações gravadas recentemente em novas conversações."
+
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -587,33 +601,30 @@
 #. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Minimiza a lista de contactos e suas conversas quando está ausente."
-
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "Tempo inactivo"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Definir"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "inactivo por"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "minutos."
-
-#: plugins/idle.c:96
+msgstr ""
+"Minimiza a lista de contactos e as suas conversações quando fica ausente."
+
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "Minutos"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "Criador de Inactividade"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "Definir Tempo Inactivo da Conta"
+
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Definir"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "Criador de Inactividade"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:793
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Permite-o configurar manualmente por quanto tempo está inactivo"
 
@@ -727,7 +738,7 @@
 #. Remove on focus button
 #: plugins/notify.c:646
 msgid "Remove when conversation window _gains focus"
-msgstr "Remover quando a janela de conversação _ganhar foco"
+msgstr "Remover quando a janela de conversa _ganhar foco"
 
 #. Remove on click button
 #: plugins/notify.c:654
@@ -747,7 +758,7 @@
 #. Remove on conversation switch button
 #: plugins/notify.c:679
 msgid "Remove on conversation ta_b switch"
-msgstr "Remover quando se troca de a_bas na janela da conversação"
+msgstr "Remover quando se troca de a_bas na janela da conversa"
 
 #. *< api_version
 #. *< type
@@ -864,7 +875,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -872,7 +883,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais estão a funcionar correctamente."
 
@@ -986,7 +997,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fornece um 'wrapper' à volta das bibliotecas de suporte SSL."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:910
 #, c-format
 msgid "%s has gone away."
 msgstr "%s está ausente."
@@ -1029,11 +1040,11 @@
 "Notifica na janela de conversa quando um contacto sai ou entra do estado de "
 "ausente ou inactivo."
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de Plugins Tcl"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plugins Tcl."
 
@@ -1064,6 +1075,10 @@
 msgid "Delay"
 msgstr "Esperar"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "minutos."
+
 #: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "_Aplicar"
@@ -1086,33 +1101,34 @@
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
-"Adiciona marcações de tempo como as do iChat às conversas a cada N minutos."
+"Adiciona marcações de tempo como as do iChat às conversações a cada N "
+"minutos."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "Janelas de Conversa MI"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "Transparência da janela de _MI"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante na janela de MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "Janela da lista de contactos"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "Transparência da janela da _lista de contactos"
 
@@ -1123,22 +1139,27 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:466
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Transparência Variável para a lista de contactos e conversações."
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:468
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"Este plugin activa a transparência variável nas janelas de conversa.\n"
+"Este plugin activa a transparência alpha variável nas janelas de conversa e "
+"na lista de contactos.\n"
 "\n"
 "* Nota: Este plugin requer Win2000 ou WinXP."
 
@@ -1156,8 +1177,8 @@
 msgstr "_Iniciar o Gaim quando o Windows arranca"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "Lista de contactos"
 
@@ -1176,10 +1197,10 @@
 msgstr "_Manter a janela da lista de contactos no topo"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
-msgstr "Conversas"
+msgstr "Conversações"
 
 #: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
@@ -1193,16 +1214,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Opções específicas do Gaim para Windows."
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "Sobre o Gaim"
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1212,305 +1233,330 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zepyhr, e Gadu-Gadu ao mesmo tempo. É "
 "escrito usando o Gtk+ e é licenciado sob a GPL.<BR><BR>"
 
-#: src/about.c:104
-#, fuzzy
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim no irc.freenode.net<BR><BR>"
-
-#: src/about.c:109
-msgid "Active Developers"
-msgstr "Desenvolvedores activos"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim no irc.freenode.net<BR><BR>"
 
 #: src/about.c:110
+msgid "Active Developers"
+msgstr "Desenvolvedores Activos"
+
+#: src/about.c:111
 msgid "maintainer"
 msgstr "encarregado"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
-#: src/about.c:115
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "desenvolvedor & webmaster"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: src/about.c:122
+#: src/about.c:124
 msgid "support"
 msgstr "suporte"
 
-#: src/about.c:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
-msgstr "Escritores de patch malucos"
-
-#: src/about.c:144
+msgstr "Escritores de Patches Malucos"
+
+#: src/about.c:146
 msgid "Retired Developers"
-msgstr "Desenvolvedores aposentados"
-
-#: src/about.c:145
+msgstr "Desenvolvedores Aposentados"
+
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "antigo encarregado da libfaim"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "antigo desenvolvedor principal"
 
-#: src/about.c:149
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "antigo encarregado"
 
-#: src/about.c:150
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "antigo desenvolvedor do Jabber"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "original author"
 msgstr "autor original"
 
-#: src/about.c:154
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo preguiçoso]"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Current Translators"
-msgstr "Actuais tradutores"
-
-#: src/about.c:163 src/about.c:197
+msgstr "Actuais Tradutores"
+
+#: src/about.c:165 src/about.c:202
 msgid "Catalan"
 msgstr "Catalão"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "Checo"
 
-#: src/about.c:165
+#: src/about.c:167
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: src/about.c:166
+#: src/about.c:168
 msgid "British English"
 msgstr "Inglês de Inglaterra"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:169
+msgid "Canadian English"
+msgstr "Inglês do Canadá"
+
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "Alemão"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:172 src/about.c:206
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "Francês"
 
-#: src/about.c:171
+#: src/about.c:174
+msgid "Hebrew"
+msgstr "Hebraico"
+
+#: src/about.c:175
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/about.c:172
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/about.c:175
+#: src/about.c:179
 msgid "Dutch; Flemish"
 msgstr "Holandês; Flamengo"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Macedonian"
 msgstr "Macedónio"
 
-#: src/about.c:177
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/about.c:179
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "Português"
 
-#: src/about.c:180
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Romanian"
 msgstr "Romeno"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "Russo"
 
-#: src/about.c:183
+#: src/about.c:187
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:188
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Equipa Vi Gnome"
 
-#: src/about.c:186
+#: src/about.c:191
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: src/about.c:187
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: src/about.c:194
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: src/about.c:195
+#: src/about.c:200
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: src/about.c:196
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "Hebraico"
-
-#: src/about.c:205
-msgid "Japanese"
-msgstr "Japonês"
-
 #: src/about.c:209
+msgid "Japanese"
+msgstr "Japonês"
+
+#: src/about.c:213
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/about.c:211
+#: src/about.c:215
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:998
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: src/account.c:288
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "Senha Original"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "Nova senha"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: src/account.c:341
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
 msgstr "Por favor digite a sua senha actual e a sua nova senha."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
+#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
+#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
+#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
+#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/request.h:1242
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
+#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
+#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
+#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
 msgstr "Mudar informações do utilizador %s"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Guardar"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "Ausente!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "Estou de volta!"
 
-#: src/away.c:375
-msgid "New Away Message"
-msgstr "Nova mensagem de ausência"
-
-#: src/away.c:395
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Tem a certeza que deseja remover a mensagem de ausência \"%s\"?"
+
+#: src/away.c:332 src/away.c:423
 msgid "Remove Away Message"
 msgstr "Remover mensagem de ausência"
 
-#: src/away.c:590
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "Remover"
+
+#: src/away.c:403
+msgid "New Away Message"
+msgstr "Nova mensagem de ausência"
+
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "Definir todos como ausente"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "Chats"
 
@@ -1533,108 +1579,113 @@
 msgid "Group not removed"
 msgstr "Grupo não removido"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "Nome de grupo inválido"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-"Foi encontrado um erro ao processar a sua lista de contactos. Ela não foi "
-"carregada."
-
-#: src/blist.c:2222
+#: src/blist.c:2236
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"Foi encontrado um erro ao processar a sua lista de contactos. Não foi "
+"carregada, e o ficheiro antigo foi movido para blist.xml~."
+
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "Erro da lista de contactos"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o plugin de protocolo para %s"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Erro ao registar"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Erro de ligação"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Digite a senha para %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "Impossível enviar mensagem. A mensagem é muito extensa."
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "Impossível enviar mensagem."
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Mudou o seu nome para %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou o seu nome para %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mais)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " saiu da sala (%s)."
 
-#: src/conversation.c:2467
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "Nova janela"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "Por conta"
 
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "Por número de conversas"
+
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Alertar Utilizador"
@@ -1708,11 +1759,11 @@
 msgid "Remove Contact"
 msgstr "Remover Contacto"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "Nome de _utilizador"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "_Conta"
 
@@ -1735,74 +1786,77 @@
 "Por favor digite o nome de utilizador da pessoa cuja informação gostaria de "
 "ver."
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "Seleccionar cor do texto"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "Seleccionar cor de fundo"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Seleccionar fonte"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:575
+msgid "Get User Log"
+msgstr "Ver Registo do Utilizador"
+
+#: src/dialogs.c:577
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr ""
+"Por favor digite o nome de utilizador da pessoa cujo registo gostaria de ver."
+
+#: src/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "Não pode guardar uma mensagem de ausência com o título em branco"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Por favor dê um título à mensagem, ou escolha \"Usar\" para usar sem guardar."
 
-#: src/dialogs.c:704
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "Não pode criar uma mensagem de ausência vazia"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "Nova mensagem de ausência"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "Título: "
 
-#: src/dialogs.c:843
-msgid "Save & Use"
-msgstr "Guardar e usar"
-
-#: src/dialogs.c:847
-msgid "Use"
-msgstr "Usar"
-
-#: src/dialogs.c:868
+#: src/dialogs.c:781
+msgid "_Save"
+msgstr "_Guardar"
+
+#: src/dialogs.c:785
+msgid "Sa_ve & Use"
+msgstr "Guar_dar e Usar"
+
+#: src/dialogs.c:789
+msgid "_Use"
+msgstr "_Usar"
+
+#: src/dialogs.c:811
 msgid "Alias Chat"
-msgstr "Renomear chat"
-
-#: src/dialogs.c:869
+msgstr "Renomear Chat"
+
+#: src/dialogs.c:812
 msgid "Enter an alias for this chat."
 msgstr "Digite um nome para este chat."
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "Nome"
 
-#: src/dialogs.c:885
+#: src/dialogs.c:828
 msgid "Alias Contact"
 msgstr "Renomear Contacto"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:829
 msgid "Enter an alias for this contact."
 msgstr "Digite um nome para este contacto."
 
-#: src/dialogs.c:903
+#: src/dialogs.c:846
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um nome para %s."
 
-#: src/dialogs.c:905
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "Definir nome para este contacto"
 
@@ -1916,21 +1970,21 @@
 #. for people like myself, who are too lazy to add an away msg :)
 #: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
-msgstr "desculpe, saí por um bocado. Volto depois"
-
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+msgstr "lamento, saí por um bocado. Volto depois"
+
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "padrão chato"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "Alfabetica"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "Por estado"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "Por tamanho do log"
 
@@ -1954,7 +2008,7 @@
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
 msgstr "Nome do utilizador:"
 
@@ -1962,7 +2016,7 @@
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "Nome:"
 
@@ -1981,7 +2035,7 @@
 
 #: src/gtkaccount.c:564
 msgid "Buddy icon file:"
-msgstr "Arquivo do ícone de contacto:"
+msgstr "Ficheiro do ícone de contacto:"
 
 #: src/gtkaccount.c:574
 msgid "_Browse"
@@ -2023,7 +2077,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -2039,15 +2093,15 @@
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "_Porta:"
 
@@ -2055,7 +2109,7 @@
 msgid "_Username:"
 msgstr "_Nome de utilizador:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
@@ -2077,27 +2131,28 @@
 msgstr "Mostrar menos opções"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
 msgid "Register"
 msgstr "Registar"
 
 #: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Tem certeza de que deseja apagar %s?"
+msgstr "Tem a certeza que deseja apagar %s?"
 
 #: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
 msgid "Screen Name"
 msgstr "Nome de utilizador"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "Ligado"
 
@@ -2129,25 +2184,17 @@
 msgstr "Adicionar contacto à sua lista?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
+#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Actualmente, não está ligado em nenhum protocolo que possui o recurso de "
-"chat."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "Entrar num Chat"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2155,190 +2202,198 @@
 "Por favor digite alguma informação sobre o chat ao qual gostaria de se "
 "juntar.\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "Ver _Info"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "_Adicionar Notificação de Contacto"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "Ver _Log"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
 msgid "_Alias..."
 msgstr "_Nome Local..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "Adicionar um _Contacto"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "Adicionar um C_hat"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Entrar"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "Auto-Entrar"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "Co_lapsar"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Não está ligado a nenhuma conta que possa adicionar esse contacto."
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/_Contactos"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contactos/Nova _Mensagem Imediata..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contactos/Entrar num _Chat..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contactos/Ver Info do _Utilizador..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2296
+msgid "/Buddies/View User _Log..."
+msgstr "/Contactos/Ver _Registo do Utilizador..."
+
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contactos/Mostrar C_ontactos Desligados"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contactos/Mostrar Grupos _Vazios"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contactos/_Adicionar Contacto..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contactos/Adicionar C_hat..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/Contactos/Adicionar _Grupo..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/Contactos/_Desligar"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/Contactos/_Sair"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/Ferrramentas/_Ausência"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Ferramentas/_Notificação de contacto"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Ferramentas/Acções de P_rotocolo"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2311
+msgid "/Tools/Account Ac_tions"
+msgstr "/Ferramentas/Acções de Con_tas"
+
+#: src/gtkblist.c:2312
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Ferramentas/Acções de _Plugins"
+
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/Ferramentas/_Contas"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de _Ficheiros"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _Salas"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/_Preferências"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/Ferramentas/Ver _Log do Sistema"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "Novo nome do grupo"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "Por favor digite um novo nome para o grupo selecionado."
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2347,16 +2402,20 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>Estado:</b> Desligado"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2435
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>Estado:</b> Desligado"
+
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2364,7 +2423,7 @@
 "\n"
 "<b>Conta: </b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2372,7 +2431,7 @@
 "\n"
 "<b>Nome Local:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2380,7 +2439,7 @@
 "\n"
 "<b>Nome local:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2388,7 +2447,7 @@
 "\n"
 "<b>Nome remoto:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2396,7 +2455,7 @@
 "\n"
 "<b>Ligado por:</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2404,7 +2463,7 @@
 "\n"
 "<b>Inactivo por:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2412,7 +2471,7 @@
 "\n"
 "<b>Alertado:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2420,7 +2479,7 @@
 "\n"
 "<b>Descrição:</b> Assombrado"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2428,7 +2487,7 @@
 "\n"
 "<b>Estado</b>: Incrível"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2436,77 +2495,96 @@
 "\n"
 "<b>Estado</b>: Na Maior"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inactivo (%dh%02dm) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactivo (%dm) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Alertado (%d%%) "
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "Desligado "
 
-#: src/gtkblist.c:3032
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2875
+msgid "/Buddies/Join a Chat..."
+msgstr "/Contactos/Entrar num Chat..."
+
+#: src/gtkblist.c:2878
+msgid "/Tools/Room List"
+msgstr "/Ferramentas/Lista de Salas"
+
+#: src/gtkblist.c:2881
+msgid "/Tools/Privacy"
+msgstr "/Ferramentas/Privacidade"
+
+#: src/gtkblist.c:3026
 msgid "/Tools/Away"
 msgstr "/Ferramentas/Ausência"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3029
 msgid "/Tools/Buddy Pounce"
 msgstr "/Ferramentas/Notificação de Contactos"
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/Ferramentas/Ações de Protocolo"
+#: src/gtkblist.c:3032
+msgid "/Tools/Account Actions"
+msgstr "/Ferramentas/Acções de _Contas"
+
+#: src/gtkblist.c:3035
+msgid "/Tools/Plugin Actions"
+msgstr "/Ferramentas/Acções de Plugins"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contactos/Mostrar Contactos Desligados"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contactos/Mostrar Grupos Vazios"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "Enviar uma mensagem para o contacto seleccionado"
 
+#: src/gtkblist.c:3158
+msgid "Get information on the selected buddy"
+msgstr "Ver informações sobre o contacto seleccionado"
+
 #: src/gtkblist.c:3161
-msgid "Get information on the selected buddy"
-msgstr "Ver informações sobre o contacto seleccionado"
-
-#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "Entrar numa sala de chat"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "_Ausente"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "Definir uma mensagem de ausência"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
+#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
+#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
 msgid "Add Buddy"
 msgstr "Adicionar contacto"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3933
 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. "
@@ -2518,15 +2596,23 @@
 "possível.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "Conta:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4237
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Neste momento não está ligado a nenhum protocolo que possua o recurso de "
+"chat."
+
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "Adicionar chat"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4268
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2534,15 +2620,15 @@
 "Por favor digite um nome, e as informações apropriadas sobre o chat que "
 "gostaria de adicionar à sua lista de contactos.\n"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4348
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
@@ -2596,20 +2682,20 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa com %s</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
-msgstr "Este ficheiro já existe"
-
-#: src/gtkconv.c:191 src/gtkft.c:1106
+msgstr "Esse ficheiro já existe"
+
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "Deseja gravar por cima?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar Contacto Para Sala de Chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:582
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2617,442 +2703,449 @@
 "Por favor digite o nome do utilizador que gostaria de convidar, e uma "
 "mensagem de convite opcional."
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "Encontrar"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "_Pesquisar por:"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "Ver Msg de Ausência"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "Remover"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "Guardar ícone como..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "O utilizador está digitando..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "O utilizador digitou algo e parou"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "_Enviar como"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "Guardar Conversa"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _Mensagem Imediata..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Encontrar..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _Log..."
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Guardar como..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3152
+msgid "/Conversation/Clear"
+msgstr "/Conversa/Limpar"
+
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar No_tificação de Contacto..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver Informações"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/Conversa/_Alertar..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/Conversa/_Nome..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir El_o..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir _Imagem..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/OpçÕes/Gravar _log"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Activar _sons"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Opções/Mostrar Barra de _Formatação"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver Log"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar Notificação de Contacto..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver Informações"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/Conversa/Alertar..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Nome..."
 
-#: src/gtkconv.c:3249
-msgid "/Conversation/Block..."
-msgstr "/Conversa/Bloquear..."
-
-#: src/gtkconv.c:3253
-msgid "/Conversation/Add..."
-msgstr "/Conversa/Adicionar..."
-
-#: src/gtkconv.c:3257
-msgid "/Conversation/Remove..."
-msgstr "/Conversa/Remover..."
-
 #: src/gtkconv.c:3263
+msgid "/Conversation/Block..."
+msgstr "/Conversa/Bloquear..."
+
+#: src/gtkconv.c:3267
+msgid "/Conversation/Add..."
+msgstr "/Conversa/Adicionar..."
+
+#: src/gtkconv.c:3271
+msgid "/Conversation/Remove..."
+msgstr "/Conversa/Remover..."
+
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir Elo..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Activar sons"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Opções/Mostrar Barra de Formatação"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "Enviar"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "Alertar"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "Alertar o utilizador"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "Bloquear o utilizador"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "Adicionar o utilizador à sua lista de contactos"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "Remover o utilizador da sua lista de contactos"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "Ver informações do utilizador"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "Convidar um utilizador"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "Adicionar o chat à sua lista de contactos"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "Remover o chat da sua lista de contactos"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "Tópico:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "Mandar uma MI para o utilizador"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "Ignorar o utilizador"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversa/Fechar"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "Guardar Registo de Depuração"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "Janela de debug"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "Marcações de tempo"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "Terminado"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "Cancelado"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "Esperando que a transferência comece"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
-msgstr "<b>Recebendo de:</b>"
-
-#: src/gtkft.c:212
+msgstr "<b>Recebendo De:</b>"
+
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
-msgstr "<b>Enviando para:</b>"
-
-#: src/gtkft.c:386
+msgstr "<b>Enviando Para:</b>"
+
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "Não existe nenhum programa configurado para abrir este tipo de ficheiro."
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "Ocorreu um erro ao abrir o ficheiro."
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "Progresso"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "Restante"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "Tempo decorrido:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "_Manter a janela aberta"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "_Limpar transferências concluídas"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "Mostrar detalhes da transferência"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "Esconder detalhes da transferência"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Cancelado"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "Falhou"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "Este ficheiro não existe."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "Não é possível enviar um ficheiro de 0 bytes."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
-msgstr "Este ficheiro já existe."
-
-#: src/gtkft.c:1131
+msgstr "Esse ficheiro já existe."
+
+#. Open file selector to select the public key.
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
 msgid "Open..."
 msgstr "Abrir..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "Guardar Como..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s deseja enviar-lhe %s (%s)"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aceitar pedido de transferência de ficheiro de %s?"
 
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3063,19 +3156,31 @@
 "Anfitrião remoto: %s\n"
 "Porto remoto: %d"
 
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "Co_lar Como Texto"
+
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "Cor do elo"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "Cor para escrever elos."
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar Endereço de E-Mail"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "_Copiar Endereço do Elo"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "_Abrir Elo no Navegador"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3083,32 +3188,40 @@
 "Não foi possível descobrir o tipo de imagem baseando-se na extensão "
 "fornecida.  O padrão (PNG) vai ser usado."
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Erro ao guardar imagem: %s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "Guardar imagem"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "_Guardar imagem..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Seleccionar fonte"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "Seleccionar cor do texto"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "Seleccionar cor de fundo"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Descrição"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Inserir Elo"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3116,74 +3229,86 @@
 "Por favor digite o URL e a descrição do elo que gostaria de inserir.  A "
 "descrição é opcional."
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Por favor digite o URL do elo que deseja inserir."
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "Inserir Elo"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossível guardar imagem: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "Inserir Imagem"
 
+#: src/gtkimhtmltoolbar.c:638
+msgid "This theme has no available smileys."
+msgstr "Este tema não tem smileys disponíveis"
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
-msgstr "Emoticon!"
-
-#: src/gtkimhtmltoolbar.c:825
+msgstr "Sorria!"
+
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "Negrito"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "Itálico"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "Maior tamanho de letra"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "Menor tamanho de letra"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "Fonte"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "Cor da letra"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "Inserir elo"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
-msgstr "Inserir emoticon"
+msgstr "Inserir smiley"
 
 #: src/gtklog.c:282
 msgid "Conversations with"
-msgstr "Conversas com"
+msgstr "Conversações com"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "Registo do Sistema"
 
@@ -3195,17 +3320,17 @@
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Assunto:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3216,7 +3341,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3227,185 +3352,185 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "Impossível abrir URL"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Foi escolhido o comando 'Manual' do navegador, mas nenhum comando foi "
 "definido."
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:193
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor digite o contacto que terá a notificação."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:406 src/gtkpounce.c:846
 msgid "New Buddy Pounce"
 msgstr "Nova notificação de contacto"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:406
 msgid "Edit Buddy Pounce"
 msgstr "Editar notificação de contacto"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:424
 msgid "Pounce Who"
 msgstr "Quem terá a notificação"
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
+#: src/gtkpounce.c:451
+msgid "_Buddy name:"
 msgstr "_Nome do contacto:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:475
 msgid "Pounce When"
 msgstr "Quando notificar"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "_Ligar"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:485
 msgid "Sign _off"
 msgstr "_Desligar"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:487
 msgid "A_way"
 msgstr "_Ausente"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:489
 msgid "Re_turn from away"
 msgstr "_Voltar de 'Ausente'"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:491
 msgid "_Idle"
 msgstr "_Inactivo"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:493
 msgid "Retur_n from idle"
 msgstr "Voltar do 'I_nactivo'"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:495
 msgid "Buddy starts _typing"
 msgstr "Contacto começar a digi_tar"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:497
 msgid "Buddy stops t_yping"
 msgstr "Contacto parar de d_igitar"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:526
 msgid "Pounce Action"
 msgstr "Acção usada para notificar"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:533
 msgid "Op_en an IM window"
 msgstr "_Abrir uma janela de MI"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:534
 msgid "_Popup notification"
 msgstr "Mostrar notificação"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:535
 msgid "Send a _message"
 msgstr "Enviar uma mensagem"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:536
 msgid "E_xecute a command"
 msgstr "Executar um comando"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:537
 msgid "P_lay a sound"
 msgstr "Tocar um som"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:541
 msgid "B_rowse..."
 msgstr "_Procurar"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:543
 msgid "Bro_wse..."
 msgstr "P_rocurar"
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:544
 msgid "Pre_view"
 msgstr "Pre-_visualização"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:627
 msgid "Sav_e this pounce after activation"
 msgstr "_Guardar esta notificação após activação"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:853
 msgid "Remove Buddy Pounce"
 msgstr "Remover notificação de contacto"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:903
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s começou a digitar para si"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:904
 #, c-format
 msgid "%s has signed on"
 msgstr "%s ligou-se"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:905
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s saiu do estado 'Inactivo'"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:906
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s saiu do estado 'Ausente'"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:907
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s parou de digitar para si"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:908
 #, c-format
 msgid "%s has signed off"
 msgstr "%s desligou-se"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:909
 #, c-format
 msgid "%s has become idle"
 msgstr "%s tornou-se inactivo"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:911
 msgid "Unknown pounce event. Please report this!"
-msgstr "Evento de notificação desconhecido. Por favor reporte isto!"
-
-#: src/gtkprefs.c:399
+msgstr "Acontecimento de notificação desconhecido. Por favor reporte isto!"
+
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "Opções da interface"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Mostrar nomes remotos se nenhum nome local estiver definido"
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:632
 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."
@@ -3413,420 +3538,325 @@
 "Seleccione um tema de smiley que gostaria de usar da lista abaixo. Novos "
 "temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "Descrição"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "Estilo"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "_Negrito"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "_Itálico"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "_Sublinhado"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "_Riscado"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "Fonte"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "Usar _letra personalizada"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "Usar _tamanho personalizado"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "Cor"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "_Cor do texto"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "Cor de _fundo"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "Mostrar _smileys gráficos"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "Mostrar _marcações de tempo nas mensagens"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "Mostrar _URLs como elos"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:784
 msgid "Ignore c_olors"
 msgstr "Ignorar c_ores"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:786
 msgid "Ignore font _faces"
 msgstr "Ignorar tipos de _letra"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:788
 msgid "Ignore font si_zes"
 msgstr "Ignorar _tamanhos de letra"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "_Ignorar formatação nas mensagens recebidas"
+
+#: src/gtkprefs.c:795
+msgid "Default Formatting"
+msgstr "Formatação Padrão"
+
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "_Enviar formatação padrão nas mensagens enviadas"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Este é o modo como a sua mensagem enviada aparecerá quando estiver a usar "
+"protocolos que suportem formatação. :)"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "Enter _envia mensagem"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter envia mensagem"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:875
 msgid "Window Closing"
-msgstr "Fechar janelas"
-
-#: src/gtkprefs.c:842
+msgstr "Fechar Janelas"
+
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
-msgstr "_ESC fecha janela"
-
-#: src/gtkprefs.c:845
+msgstr "_Escape fecha a janela"
+
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "Inserções"
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Control-{B/I/U} insere tags _HTML"
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:880
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} muda a _formatação"
+
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(número) _insere smileys"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
-msgstr "Classificação da lista de contactos"
-
-#: src/gtkprefs.c:873
+msgstr "Classificação da Lista de Contactos"
+
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "_Ordenação:"
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "Barra de ferramentas da lista de contactos"
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
 msgid "Show _buttons as:"
 msgstr "Mostrar _botões como:"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
 msgid "Pictures"
 msgstr "Imagens"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
 msgid "Text"
 msgstr "Texto"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
 msgid "Pictures and text"
 msgstr "Imagens e texto"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "_Levantar janela quando ocorrerem acontecimentos."
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "Exibição de grupos"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "Mostrar _números em grupos"
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "Exibição de contactos"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "Mostrar í_cones de contactos"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "Mostrar _níveis de alerta"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "Mostrar _tempo de inactividade"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "Turvar contactos in_activos"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "Expandir contactos _automaticamente"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "_Posição:"
 
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "Enviar _URLs como elos"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:976
+msgid "Number of conversations per window"
+msgstr "Número de conversas por janela"
+
+#: src/gtkprefs.c:985
 msgid "Show _formatting toolbar"
 msgstr "Mostrar barra de _formatação"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:988
 msgid "Show a_liases in tabs/titles"
 msgstr "Mostrar n_omes em abas/títulos"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "Opções de abas"
 
-#: src/gtkprefs.c:947
+#: src/gtkprefs.c:993
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Mostrar MIs e chats em janelas com _abas"
+
+#: src/gtkprefs.c:996
+msgid "Show IMs and chats in _same tabbed window"
+msgstr "Mostrar MIs e chats na mesma janela com _abas"
+
+#: src/gtkprefs.c:1006
+msgid "Show _close button on tabs"
+msgstr "Mostrar o botão de _fechar nas abas."
+
+#: src/gtkprefs.c:1019
 msgid "_Tab Placement:"
 msgstr "_Posição das abas:"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:1021
 msgid "Top"
 msgstr "Cima"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:1022
 msgid "Bottom"
 msgstr "Baixo"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:1023
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:1024
 msgid "Right"
 msgstr "Direita"
 
-#: src/gtkprefs.c:958
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Mostrar MIs e chats em janelas com _abas"
-
-#: src/gtkprefs.c:961
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "Mostrar MIs e chats na mesma janela com _abas"
-
-#: src/gtkprefs.c:971
-msgid "Show _close button on tabs"
-msgstr "Mostrar o botão de _fechar nas abas."
-
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "Mostrar os í_cones de estado nas abas."
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
 msgid "Window"
 msgstr "Janela"
 
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "_Largura das novas janelas:"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "_Altura das novas janelas:"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "_Altura do campo de entrada:"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "Ocultar janela ao _enviar"
-
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1073
 msgid "Buddy Icons"
 msgstr "Ícones de Contactos"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "Activar a_nimação nos ícones de contacto"
 
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "Mostrar _entradas de utilizadores na janela"
-
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "Notificação de digitação"
 
-#: src/gtkprefs.c:1042
-msgid "Notify buddies that you are _typing to them"
-msgstr "Notificar contactos de que está _digitando para eles"
-
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "Completar com TAB"
-
 #: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "_Completar nomes com TAB"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "Completar nomes da maneira _antiga"
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr "_Mostrar na janela pessoas que entram"
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr "M_ostrar na janela pessoas que saiem"
-
-#: src/gtkprefs.c:1090
+msgid "Notify buddies that you are _typing to them"
+msgstr "Notificar contactos de que está _digitando para eles"
+
+#: src/gtkprefs.c:1115
 msgid "Co_lorize screen names"
 msgstr "Co_lorir nomes de utilizadores"
 
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4811
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1138
 msgid "_Autodetect IP Address"
 msgstr "Detectar IP _Automáticamente"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1147
 msgid "Public _IP:"
 msgstr "_IP Público:"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1171
 msgid "Ports"
 msgstr "Portos"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o intervalo de portos a ouvir"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "Porto _Inicial:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "Porto _Final:"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "Tipo de proxy"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "_Utilizador:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "Padrão Gnome"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "Selecção do Navegador"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "_Abrir elo em:"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "Omissão do navegador"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "Nova aba"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3835,84 +3865,79 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "Registos de Mensagens"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1493
 msgid "Log _Format:"
 msgstr "_Formato do Registo:"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1496
 msgid "_Log all instant messages"
 msgstr "_Gravar todas as mensagens imediatas"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1498
 msgid "Log all c_hats"
 msgstr "Gravar todos os _chats"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1501
 msgid "System Logs"
 msgstr "Registos do Sistema"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1503
 msgid "_Enable system log"
 msgstr "_Activar registo do sistema"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1506
 msgid "Log when buddies _sign on/sign off"
 msgstr "Registar quando contactos _se ligam/desligam"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1512
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registar quando contactos se tornam activos/_inactivos"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "Registar quando contactos ficam ausentes/_voltam"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Registar as suas _próprias ligações/inactividades/ausências"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "Opções de Som"
 
-#: src/gtkprefs.c:1551
-#, fuzzy
-msgid "Sounds when you _log in"
-msgstr "_Nenhum som ao ligar"
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
-msgstr "Sons quando a conversação tem _foco"
-
-#: src/gtkprefs.c:1555
+msgstr "Sons quando a conversa tem _foco"
+
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "_Sons enquanto ausente"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "_Método:"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3921,73 +3946,61 @@
 "C_omando do som:\n"
 "(%s para nome do ficheiro)"
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "_Enviar mensagens remove o estado de ausente"
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "_Ocultar novas mensagens quando ausente"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "Auto-resposta"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "Segundos antes de _re-enviar:"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "Enviar _auto-resposta"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "Enviar auto-resposta apenas quando _inactivo"
 
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "Enviar auto-resposta em _conversas activas"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "Inactivo"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "Relatório de _tempo de inactividade:"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Utilização do Gaim"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "Utilização do X"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "Utilização do Windows"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "Ausência Automática"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "Definir estado de 'Ausente' _quando inactivo"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "_Minutos antes de definir 'Ausente':"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "Men_sagem de ausência:"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4002,7 +4015,7 @@
 "<span weight=\"bold\">Página da web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4017,108 +4030,104 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>  %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "Sumário"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "Selecção de som"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "Tocar"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2301
 msgid "Event"
-msgstr "Evento"
-
-#: src/gtkprefs.c:2321
+msgstr "Acontecimento"
+
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "Testar"
 
-#: src/gtkprefs.c:2325
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "Redefinir"
 
-#: src/gtkprefs.c:2329
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "_Editar"
 
+#: src/gtkprefs.c:2499
+msgid "Interface"
+msgstr "Interface"
+
 #: src/gtkprefs.c:2500
-msgid "Interface"
-msgstr "Interface"
+msgid "Smiley Themes"
+msgstr "Temas de Smiley"
 
 #: src/gtkprefs.c:2501
-msgid "Smiley Themes"
-msgstr "Temas de Smiley"
+msgid "Message Text"
+msgstr "Texto das mensagens"
 
 #: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr "Fontes"
-
-#: src/gtkprefs.c:2503
-msgid "Message Text"
-msgstr "Texto das mensagens"
-
-#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2505
 msgid "IMs"
 msgstr "MIs"
 
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2507
 msgid "Network"
 msgstr "Rede"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "Navegador"
 
+#: src/gtkprefs.c:2513
+msgid "Logging"
+msgstr "Registos"
+
+#: src/gtkprefs.c:2514
+msgid "Sounds"
+msgstr "Sons"
+
 #: src/gtkprefs.c:2515
-msgid "Logging"
-msgstr "Registos"
+msgid "Sound Events"
+msgstr "Acontecimentos de som"
 
 #: src/gtkprefs.c:2516
-msgid "Sounds"
-msgstr "Sons"
+msgid "Away / Idle"
+msgstr "Ausente / Inactivo"
 
 #: src/gtkprefs.c:2517
-msgid "Sound Events"
-msgstr "Eventos de som"
-
-#: src/gtkprefs.c:2518
-msgid "Away / Idle"
-msgstr "Ausente / Inactivo"
-
-#: src/gtkprefs.c:2519
 msgid "Away Messages"
 msgstr "Mensagens de ausência"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "Protocolos"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4142,79 +4151,81 @@
 msgid "Block only the users below"
 msgstr "Bloquear apenas os utilizadores abaixo"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Mudanças nas configurações de privacidade entram em efeito imediatamente."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "Permitir utilizador"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "Digite um utilizador que permite que o contacte."
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Por favor digite o nome do utilizador que gostaria que pudesse contactá-lo."
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s o contacte?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Tem certeza que deseja permitir que %s o contacte?"
-
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+msgstr "Tem a certeza que deseja permitir que %s o contacte?"
+
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "Bloquear o utilizador"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "Digite um utilizador para bloquear."
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do utilizador que deseja bloquear."
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Tem certeza que deseja bloquear %s?"
+msgstr "Tem a certeza que deseja bloquear %s?"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "Não"
 
@@ -4222,24 +4233,17 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"De momento não está ligado a nenhum protocolo que possua o recurso de listar "
-"salas."
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "Lista de Salas"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "_Ver Lista"
 
@@ -4283,12 +4287,12 @@
 msgid "Someone says your name in chat"
 msgstr "Alguém diz o seu nome no chat"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Impossível tocar o som porque o ficheiro escolhido (%s) não existe."
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4296,7 +4300,7 @@
 "Não foi possível tocar o som porque o método para reproduzir o som 'Comando' "
 "foi selecionado, mas nenhum comando foi definido."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4305,11 +4309,11 @@
 "Não foi possível tocar o som porque o comando de som configurado não pôde "
 "ser executado: %s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "Impossível guardar ficheiro de ícone no disco."
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "Guardar Ícone"
 
@@ -4318,11 +4322,11 @@
 msgstr ""
 "<b><font color=\"red\">O \"logger\" não tem função de leitura</font></b>"
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4331,7 +4335,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA-"
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4340,51 +4344,56 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA-"
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossível encontrar \"path\" do log!</b></font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossível ler ficheiro: %s</b></font>"
 
-#: src/log.c:661
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMATICA>: %s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "Texto corrido"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "Por favor crie uma conta."
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Ligar"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Nome de Utilizador:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>Senha:</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Ligar"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>_Conta:</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>_Senha:</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "_Contas"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "_Preferências"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4420,12 +4429,12 @@
 "  -h, --help          mostra esta ajuda e sai\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Tente `%s -h' para mais informação.\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4434,11 +4443,11 @@
 "O plugin requerido %s não foi encontrado. Por favor instale esse plugin e "
 "tente novamente."
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "O Gaim não conseguiu carregar o seu plugin."
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "O plugin requerido %s não pôde ser carregado."
@@ -4448,12 +4457,12 @@
 msgstr "Padrão um pouco menos chato"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:378 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2771
 msgid "Available"
 msgstr "Disponível"
 
@@ -4465,12 +4474,12 @@
 msgid "Away for friends only"
 msgstr "Ausente apenas para amigos"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -4486,7 +4495,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Impossível resolver endereço."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "Impossível ligar ao servidor."
 
@@ -4513,174 +4522,175 @@
 msgid "Unknown Error Code."
 msgstr "Código de erro desconhecido."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "Não foi possível ligar"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:414
 msgid "Unable to read socket"
 msgstr "Impossível ler do socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
+#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
+#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
+#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Impossível ligar."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "Lendo dados"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "Negociação de balanceador"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "Lendo a chave do servidor"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "Trocando hash das chaves"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "Erro crítico na biblioteca do GG\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Ligação para %s falhou"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "Impossível pingar servidor"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "Enviar como mensagem"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "Procurando servidor GG"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "UIN Gadu-Gadu inválido especificado"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:769
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Está a tentar enviar uma mensagem para um UIN Gadu-Gadu inválido."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "Não foi possível receber os resultados da procura"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Mecanismo de busca do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "Activo"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Primeiro Nome"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
 msgid "Nick"
 msgstr "Nome"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "Ano de Nascimento"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "Sexo"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Cidade"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
+#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "Informações de Contacto"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:950
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Não há lista de contactos gravada neste servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Não foi possível importar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista de contactos transferida para o servidor Gadu-Gadu com sucesso"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 "Não foi possível transferir a lista de contactos para o servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista de contactos removida do servidor Gadu-Gadu com sucesso"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Não foi possível apagar a lista de contactos do servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "Senha alterada com sucesso"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "Não foi possível alterar a senha"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Erro na comunicação com o servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4688,11 +4698,11 @@
 "O Gaim não pôde completar o seu pedido devido a um problema ao comunicar com "
 "o servidor HTTP do Gadu-Gadu. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Impossível importar lista de contactos Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4700,26 +4710,26 @@
 "O Gaim não pôde ligar ao servidor da lista de contactos do Gadu-Gadu. Por "
 "favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "Impossível exportar lista de contactos"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "O Gaim não pôde ligar com o servidor da lista de contactos do Gadu-Gadu. Por "
 "favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Impossível apagar a lista de contactos do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "Impossível aceder ao directório"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4727,11 +4737,11 @@
 "O Gaim não pôde pesquisar o Directório porque não conseguiu ligar ao "
 "servidor de directório. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Impossível alterar a senha do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4739,32 +4749,33 @@
 "O Gaim não pôde alterar a senha devido a um erro ao ligar ao servidor Gadu- "
 "Gadu. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "Pesquisa de directório"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
+#: src/protocols/toc/toc.c:1558
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "Importar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "Exportar lista de contactos para o servidor"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "Apagar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "Impossível aceder perfil do utilizador."
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1461
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4783,7 +4794,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
@@ -4797,16 +4808,16 @@
 msgstr "O utilizador %s (%s%s%s%s%s) quer que o autorize."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:6060
 msgid "Deny"
 msgstr "Negar"
 
@@ -4868,63 +4879,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "O Gaim não conseguiu abrir um porto de leitura."
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Erro ao mostrar o MOTD"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "Nenhum MOTD disponível"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "Não há nenhum MOTD associado a esta ligação."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD de %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: src/protocols/yahoo/yahoo.c:2456
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "Enviar"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "Nomes de IRC não podem conter espaços em branco"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
 #, c-format
 msgid "Signon: %s"
 msgstr "Ligando: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "Impossível criar socket"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+msgid "Couldn't connect to host"
+msgstr "Não foi possível ligar ao host"
+
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "Utilizadores"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "Tópico"
 
@@ -4937,32 +4956,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que é menos mau"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "Porta"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "Nome do utilizador"
 
@@ -4987,7 +5008,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo.c:3058
 msgid "Realname"
 msgstr "Nome real"
 
@@ -5036,88 +5058,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "O Gaim enviou uma mensagem que não foi entendida pelo servidor de IRC."
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:404
 msgid "No such channel"
 msgstr "Este canal não existe"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:415
 msgid "no such channel"
 msgstr "este canal não existe"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:418
 msgid "User is not logged in"
 msgstr "O utilizador está desligado"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:423
 msgid "No such nick or channel"
 msgstr "Nome ou canal inexistente"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:443
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:499
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulso por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:601
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kickado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:701
 msgid "Could not change nick"
 msgstr "Não foi possível mudar o nome"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Cannot change nick"
 msgstr "Impossível mudar o nome"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:723
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Saiu do canal%s%s"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:840
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossível entrar em %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "Impossível entrar no canal"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:871
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5125,22 +5147,22 @@
 "(Houve um erro ao converter esta mensagem. Verifique a opção 'Codificação' "
 "no editor de contas)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
+#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
 msgid "Disconnected."
 msgstr "Desligado."
 
@@ -5175,90 +5197,96 @@
 msgid "Invalid challenge from server"
 msgstr "Pedido de acesso do servidor inválido"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "Apelido"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Nome"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "Nome remoto"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "Localidade"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "Região"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "Telefone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "Nome da organização"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
 msgid "Title"
 msgstr "Título"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "Função"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4839
 msgid "Birthday"
 msgstr "Data de nascimento"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard do Jabber"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5266,64 +5294,70 @@
 "Todos os itens a seguir são opcionais. Preencha apenas as informações que "
 "quiser."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "ID Jabber"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Status"
 msgstr "Estado"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "Endereço"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "Caixa Postal"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Requisitar autorização"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:961
 msgid "Unsubscribe"
 msgstr "Des-Subscrever"
 
@@ -5419,25 +5453,9 @@
 msgstr "Erro ao iniciar sessão"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "Erro ao enviar"
 
@@ -5445,377 +5463,378 @@
 msgid "Read Error"
 msgstr "Erro de Leitura"
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:322
 msgid "Connection Failed"
 msgstr "Ligação Falhou"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:325
 msgid "SSL Handshake Failed"
 msgstr "Ligação SSL Falhou"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
 msgid "Invalid Jabber ID"
 msgstr "Identificador Jabber Inválido"
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
 msgid "SSL support unavailable"
 msgstr "Suporte SSL não está disponível"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Impossível criar socket"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:431
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registo de %s@%s efectuado com sucesso"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
 msgid "Registration Successful"
 msgstr "Registo Efectuado com Sucesso"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
 msgid "Registration Failed"
 msgstr "Erro ao Registar"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
 msgid "Already Registered"
 msgstr "Já está Registado"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "Senha"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:601
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
+#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "Telefone"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:651
 msgid "Date"
 msgstr "Data"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:659
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha a seguinte informçaão para registar a sua nova conta."
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
 msgid "Register New Jabber Account"
 msgstr "Registar Nova Conta Jabber"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
+#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "Ligando"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:784
 msgid "Initializing Stream"
 msgstr "Iniciando Stream"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:790
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:799
 msgid "Re-initializing Stream"
 msgstr "Reiniciando Stream"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:910
 msgid "Both"
 msgstr "Ambos"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:912
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:914
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:917
 msgid "To"
 msgstr "Para"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:919
 msgid "None (To pending)"
 msgstr "Nada (Para pendente)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:923
 msgid "Subscription"
 msgstr "Subscrição"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:943
 msgid "Error"
 msgstr "Erro"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Disponível para chat"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6622
 msgid "Do Not Disturb"
 msgstr "Não perturbar"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:976
 msgid "Password Changed"
 msgstr "Senha Alterada"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:977
 msgid "Your password has been changed."
 msgstr "A sua senha foi alterada."
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
 msgid "Error changing password"
 msgstr "Erro ao mudar senha"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "Alterar Senha do Jabber"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "Por favor digite a sua nova senha"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
 msgid "Set User Info"
 msgstr "Definir informações de utilizador"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1136
 msgid "Bad Request"
 msgstr "Pedido Inválido"
 
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1138
 msgid "Conflict"
 msgstr "Conflito"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1140
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade Não Implementada"
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1142
 msgid "Forbidden"
 msgstr "Proíbido"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1144
 msgid "Gone"
 msgstr "Desapareceu"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "Erro Interno do Servidor"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "Ítem Não Encontrado"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "ID Jabber Inválido"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "Inaceitável"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "Não Permitido"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1158
 msgid "Payment Required"
 msgstr "Necessário Pagamento"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1160
 msgid "Recipient Unavailable"
 msgstr "Receptor Indisponível"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1164
 msgid "Registration Required"
 msgstr "Registar Obrigatório"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1166
 msgid "Remote Server Not Found"
 msgstr "Servidor Remoto Não Foi Encontrado"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Timeout"
 msgstr "Servidor Remoto Perdido"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1170
 msgid "Server Overloaded"
 msgstr "Servidor Sobrecarregado"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
 msgstr "Serviço Indisponível"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1174
 msgid "Subscription Required"
 msgstr "Subscrição Necessária"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1176
 msgid "Unexpected Request"
 msgstr "Pedido Inesperado"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1183
 msgid "Authorization Aborted"
 msgstr "Autorização Abortada"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1185
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação incorrecta na autorização"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "Identificador de autenticação inválido (authzid)"
 
-#: src/protocols/jabber/jabber.c:1188
-msgid "Invalid Authorization Mechanism"
-msgstr "Mecanismo de Autorização Inválido"
-
 #: src/protocols/jabber/jabber.c:1191
+msgid "Invalid Authorization Mechanism"
+msgstr "Mecanismo de Autorização Inválido"
+
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorização demasiado fraco"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1199
 msgid "Temporary Authentication Failure"
 msgstr "Autenticação Temporária Falhou"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1201
 msgid "Authentication Failure"
 msgstr "Autenticação Falhou"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1205
 msgid "Bad Format"
 msgstr "Formato Inválido"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo Inválido"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "Conflito de Recursos"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "Ligação Perdida"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1214
 msgid "Host Gone"
 msgstr "Anfitrião Desapareceu"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Unknown"
 msgstr "Anfitrião Desconhecido"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "Endereço Inválido"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "Identificador Inválido"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "Espaço de Nomes Inválido"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "XML Inválido"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "Anfitriãos Não Correspondentes"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1232
 msgid "Policy Violation"
 msgstr "Violação de Normas"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1234
 msgid "Remote Connection Failed"
 msgstr "Ligação Remota Falhou"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1236
 msgid "Resource Constraint"
 msgstr "Restrição de Recursos"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1238
 msgid "Restricted XML"
 msgstr "XML Restrito"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "Ver Outro Anfitrião"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "Paragem do Sistema"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "Condição Indefinida"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Encoding"
 msgstr "Codificação Não Suportada"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Estrofe Inválido"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Version"
 msgstr "Versão Não Suportada"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1252
 msgid "XML Not Well Formed"
 msgstr "XML Não Está Bem Formado"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "Erro de Stream"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "Esconder Sistema Operativo"
 
@@ -5830,23 +5849,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin do protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "Usar TLS se disponível"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "Forçar SSL antigo"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autent. em texto simples sobre ligações não encriptadas"
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "Ligar ao servidor"
 
@@ -5922,30 +5942,30 @@
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no chat %s"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Incapaz de enviar ficheiro a %s, o utilizador não suporta transferências de "
 "ficheiros"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "Falha Ao Enviar Ficheiro"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
 msgid "Unable to request USR\n"
 msgstr "Impossível requisitar USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
 msgid "Unable to login using MD5"
 msgstr "Impossível ligar-se usando MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
 msgid "Unable to send USR"
 msgstr "Impossível enviar USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
 msgid "Requesting to send password"
 msgstr "Requisitando o envio da senha"
 
@@ -5953,11 +5973,11 @@
 msgid "Protocol version not supported"
 msgstr "Versão de protocolo não suportada"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
 msgid "Unable to request CVR\n"
 msgstr "Impossível requisitar CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to request INF\n"
 msgstr "Impossível requisitar INF\n"
 
@@ -5973,12 +5993,11 @@
 msgid "Unable to parse message."
 msgstr "Impossível processar mensagem."
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
+#: src/protocols/msn/dispatch.c:232
 msgid "Unable to write to server"
 msgstr "Impossível enviar para o servidor"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
 msgid "Syncing with server"
 msgstr "Sincronizando com o servidor"
 
@@ -6030,7 +6049,7 @@
 msgid "Not on list"
 msgstr "Não está na lista"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "Utilizador está desligado"
 
@@ -6082,7 +6101,7 @@
 msgid "Too many hits to a FND"
 msgstr "demasiados pedidos a um FND"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "Desligado"
 
@@ -6139,7 +6158,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parâmetros CVR desconhecidos ou não permitidos"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
 msgid "Unable to write"
 msgstr "Impossível enviar"
 
@@ -6175,10 +6194,10 @@
 msgid "Server too busy"
 msgstr "Servidor muito ocupado"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
 msgid "Authentication failed"
-msgstr "Autenticação mal sucedida"
+msgstr "Autenticação falhada"
 
 #: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
@@ -6210,19 +6229,19 @@
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "O seu novo nome é longo demais."
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "Defina o seu nome."
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:190
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Este é o nome que será visto como seu pelos outros contactos MSN."
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "Defina o seu número de telefone de casa."
 
@@ -6230,15 +6249,15 @@
 msgid "Set your work phone number."
 msgstr "Defina seu número de telefone do trabalho."
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "Defina o seu número de telemóvel."
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir pages MSN Mobile?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:238
 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?"
@@ -6246,91 +6265,92 @@
 "Deseja permitir ou não permitir que pessoas na sua lista de contactos enviem "
 "pages MSN Mobile para o seu telemóvel ou outro dispositivo móvel?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "Enviar"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
 msgid "On The Phone"
 msgstr "Ao telefone"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
 msgid "Out To Lunch"
 msgstr "Em horário de almoço"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "Invisível"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "Definir Nome"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "Definir número de telefone de casa"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "Definir número de telefone do trabalho"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "Definir número de telefone móvel"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "Activar/Desactivar dispositivos móveis"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permitir/Não permitir pages para dispositivos móveis"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "Iniciar chat"
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:482
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6338,7 +6358,7 @@
 "É necessário suporte SSL para o MSN. Por favor instale uma biblioteca de "
 "SSL. Veja http://gaim.sf.net/faq-ssl.php para mais informações."
 
-#: src/protocols/msn/msn.c:785
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6348,11 +6368,11 @@
 "\". Talvez seja %s@hotmail.com. Não foi feita nenhuma alteração à sua lista "
 "de utilizadores permitidos."
 
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "Nome de utilizador MSN inválido"
 
-#: src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6362,81 +6382,81 @@
 "Talvez seja %s@hotmail.com. Não foi feita nenhuma alteração à sua lista de "
 "utilizadores bloqueados."
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Erro ao recuperar perfil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3066
 msgid "Age"
 msgstr "Idade"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "Localização"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
+#: src/protocols/msn/msn.c:1452
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
+#: src/protocols/yahoo/yahoo.c:3113
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "Última actualização"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Página da web"
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informação do utilizador %s indisponível"
 
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
 msgid "The user's profile is empty."
 msgstr "O perfil de utilizador está vazio."
 
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
-msgstr "Mostrar avisos de conversação fechada"
-
-#: src/protocols/msn/msn.c:1631
+msgstr "Mostrar avisos de conversa fechada"
+
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "Mostrar avisos de tempo expirado"
 
@@ -6451,15 +6471,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Servidor de login"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "Usar Método HTTP"
 
@@ -6479,42 +6499,38 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "Erro desconhecido ao tentar autorizar no servidor de login MSN."
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Requisitando lista de contactos"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "Impossível enviar senha"
-
-#: src/protocols/msn/notification.c:397
+#: src/protocols/msn/notification.c:355
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:386
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Foi desligado. Ligou-se de outro local."
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:392
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Foi desligado. Os servidores MSN vão desligar-se temporariamente."
 
-#: src/protocols/msn/notification.c:584
+#: src/protocols/msn/notification.c:527
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "O utilizador %s (%s) quer adicionar %s à sua lista de contactos."
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "O utilizador %s (%s) quer adicioná-lo à sua lista de contactos."
 
-#: src/protocols/msn/notification.c:1362
+#: src/protocols/msn/notification.c:1351
 #, c-format
 msgid ""
 "Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
@@ -6523,11 +6539,11 @@
 "A sua lista de contactos MSN para %s está temporariamente indisponível. Por "
 "favor espere e tente novamente."
 
-#: src/protocols/msn/notification.c:1607
+#: src/protocols/msn/notification.c:1612
 msgid "Unable to transfer to notification server"
 msgstr "Impossível transferir para servidor de notificação"
 
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1799
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6546,85 +6562,101 @@
 msgstr[0] ""
 "O servidor MSN vai sair do ar para manutenção em %d minuto. Será "
 "automaticamente desligado depois desse tempo. Por favor termine quaisquer "
-"conversas em curso.\n"
+"conversações em curso.\n"
 "\n"
 "Depois de a manutenção terminar, poderá ligar com sucesso."
 msgstr[1] ""
 "O servidor MSN vai sair do ar para manutenção em %d minutos. Será "
 "automaticamente desligado depois desse tempo. Por favor termine quaisquer "
-"conversas em curso.\n"
+"conversações em curso.\n"
 "\n"
 "Depois de a manutenção terminar, poderá ligar com sucesso."
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "Erro de E/S."
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/servconn.c:210
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "Impossível ligar ao servidor %s"
+
+#: src/protocols/msn/servconn.c:214
+#, c-format
+msgid "Error writing to %s server"
+msgstr "Erro ao escrever para o servidor %s"
+
+#: src/protocols/msn/servconn.c:218
+#, c-format
+msgid ""
+"Error reading from %s server. Lastcommand was:\n"
+" %s"
+msgstr ""
+"Erro ao ler do servidor %s. O último comando era:\n"
+" %s"
+
+#: src/protocols/msn/servconn.c:222
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "Erro desconhecido do servidor %s"
+
+#: src/protocols/msn/servconn.c:315
 msgid "Received HTTP error. Please report this."
 msgstr "Erro HTTP Recebido. Por favor relate isto."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "A conversa tornou-se inactiva e esgotou o limite de tempo."
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:130
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s fechou a janela de conversa."
 
-#: src/protocols/msn/switchboard.c:300
+#: src/protocols/msn/switchboard.c:264
 msgid "An MSN message may not have been received."
 msgstr "Uma mensagem MSN pode não ter sido recebida."
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "Impossível ler cabeçalho do servidor"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr "Impossível ler mensagem do servidor. O comando é %hd, o tamanho é %hd."
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:243
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "Impossível ler mensagem do servidor: %s. O comando é %hd, o tamanho é %hd."
+
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "utilizadores: %s, ficheiros: %s, tamanho: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Impossível adicionar \"%s\" à sua hotlist do Napster"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "Foi desligado do servidor."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requisitou sua informação"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "Foi desligado do servidor, porque ligou-se de um local diferente"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requisitou um PING"
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Ver info"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1274
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -6639,74 +6671,236 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
 msgid "NAPSTER Protocol Plugin"
-msgstr "Plugin do protocolo Napster"
-
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:225
-#, fuzzy, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "Impossível enviar mensagem. A mensagem é muito extensa."
-
-#: src/protocols/novell/novell.c:371
-#, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "Impossível adicionar \"%s\" à sua hotlist do Napster"
+msgstr "Plugin do Protocolo NAPSTER"
+
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "Parâmetros obrigatórios não foram passados"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "Impossível escrever para a rede"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "Impossível ler da rede"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "Erro na comunicação com o servidor"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "A conferência não foi encontrada"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "A conferência não existe"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "Já existe uma pasta com esse nome"
+
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "Não suportado"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "Senha expirou"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "Senha inválida"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "O utilizador não foi encontrado"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "A conta foi desactivada"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "O servidor não pôde aceder ao directório"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "O seu administrador de sistema desactivou esta operação"
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "O servidor está indisponível; tente mais tarde"
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Não pode adicionar um contacto à mesma pasta duas vezes"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "Não pode adicionar-se a si próprio"
+
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "O arquivo principal está mal configurado"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "Nome de utilizador ou senha inválidos"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "Incapaz de reconhecer o anfitrião do nome de utilizador que inseriu"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+"A sua conta foi desactivada porque introduziu senhas inválidas em demasia"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Não pode adicionar a mesma pessoa duas vezes a uma conversa"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Atingiu o seu limite de número de contactos permitidos"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "Inseriu um nome de utilizador inválido"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "Ocorreu um erro ao actualizar o directório"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "Versão de protocolo incompatível"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "O utilizador bloqueou-o"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Esta versão de avaliação não permite que mais de 10 utilizadores se liguem ao "
+"mesmo tempo"
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "O utilizador está desligado ou bloqueou-o"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Erro desconhecido: 0x%X"
+
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Login falhou (%s)."
+
+#: src/protocols/novell/novell.c:232
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+"Impossível enviar mensagem. Impossível obter detalhes do utilizador (%s)."
+
+#: src/protocols/novell/novell.c:378
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Impossível adicionar %s à sua lista de contactos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, fuzzy, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "Impossível enviar mensagem."
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:489
-#, fuzzy, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "Impossível enviar mensagem. A mensagem é muito extensa."
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Impossível enviar mensagem (%s)."
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Incapaz de convidar utilizador (%s)."
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+"Impossível enviar mensagem para %s. Impossível criar a conferência (%s)."
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Impossível enviar mensagem. Incapaz de criar a conferência (%s)."
+
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr ""
+"Impossível mover utilizador %s para a pasta %s na lista lateral do servidor. "
+"Erro ao criar a pasta (%s)."
+
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, fuzzy, c-format
-msgid "GroupWise Conference %d"
-msgstr "Iniciar Conferência"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
-#, fuzzy
+"list (%s)."
+msgstr ""
+"Impossível adicionar %s à sua lista de contactos. Erro ao criar a pasta na "
+"lista lateral do servidor (%s)."
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Impossível obter detalhes do utilizador %s (%s)."
+
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Impossível adicionar %s à lista privada (%s)."
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Impossível adicionar %s à lista de contactos negados (%s)."
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Impossível adicionar %s à lista de contactos permitidos (%s)."
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Impossível remover %s da sua lista privada (%s)."
+
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Impossível mudar definições de privacidade no servidor (%s)."
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Impossível criar conferência (%s)."
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
-msgstr "Erro na comunicação com o servidor Gadu-Gadu"
-
-#: src/protocols/novell/novell.c:982
-#, fuzzy
+msgstr "Erro na comunicação com o servidor. Fechando a ligação."
+
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
-msgstr "Utilizadores"
+msgstr "Userid"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6715,106 +6909,108 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
-#, fuzzy
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/protocols/novell/novell.c:1016
-#, fuzzy
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
-msgstr "Opções de utilizador"
-
-#: src/protocols/novell/novell.c:1084
-#, fuzzy
+msgstr "Propriedades de Utilizador"
+
+#: src/protocols/novell/novell.c:1566
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "Conferência GroupWise %d"
+
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
-msgstr "Impossível ligar ao servidor."
-
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
-#, fuzzy
+msgstr "Impossível criar ligação SSL ao servidor."
+
+#: src/protocols/novell/novell.c:1621
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "Erro ao processar acontecimento ou resposta. (%s)"
+
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
-msgstr "Autenticando"
-
-#: src/protocols/novell/novell.c:1162
-#, fuzzy
+msgstr "Autenticando..."
+
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: src/protocols/novell/novell.c:1302
-#, fuzzy
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s foi convidado para esta conversa."
+
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
-msgstr "Guardar Conversa"
-
-#: src/protocols/novell/novell.c:1303
+msgstr "Convite para Conversa"
+
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1305
-#, fuzzy
+"Convite de: %s\n"
+"\n"
+"Enviado: %s"
+
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
-msgstr "Deseja gravar por cima?"
-
-#: src/protocols/novell/novell.c:1408
-#, fuzzy
+msgstr "Gostaria de se juntar à conversa?"
+
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Foi desligado porque se ligou a partir de outro computador ou aparelho."
-
-#: src/protocols/novell/novell.c:1462
+msgstr "Foi desligado porque se ligou a partir de outra estação de trabalho."
+
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
+"Parece que %s está desligado e não recebeu a mensagem que acabou de lhe "
+"enviar."
 
 #. 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:1560
-#, fuzzy
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "Por favor digite o nome do utilizador que deseja bloquear."
-
-#: src/protocols/novell/novell.c:1582
+msgstr ""
+"Impossível ligar ao servidor. Por favor digite a morada do servidor a que se "
+"deseja ligar."
+
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1846
+msgstr "Erro. Suporte SSL não está instalado."
+
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
-
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgstr "Esta conferência foi fechada. Não podem ser enviadas mais mensagens."
+
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "Desligado"
 
-#: src/protocols/novell/novell.c:2164
-#, fuzzy, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr "<b>Mensagens de Ausência:</b> "
-
-#: src/protocols/novell/novell.c:2168
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Estado:</b> "
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
-#, fuzzy
+#: src/protocols/novell/novell.c:2743
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
-msgstr "Desligado"
+msgstr "Parecer Desligado"
+
+#: src/protocols/novell/novell.c:3291
+msgid "Initiate _Chat"
+msgstr "Iniciar _Chat"
 
 #. *< api_version
 #. *< type
@@ -6827,255 +7023,290 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2428
-#, fuzzy
+msgstr "Plugin de Protocolo Novell Groupwise Messenger"
+
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
-msgstr "Endereço (Rua)"
-
-#: src/protocols/novell/novell.c:2432
-#, fuzzy
+msgstr "Endereço do servidor"
+
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
-msgstr "Servidor"
-
-#: src/protocols/oscar/oscar.c:182
+msgstr "Porto do servidor"
+
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "Erro inválido"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "Taxa para host"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "Taxa para cliente"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "Serviço indisponível"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "Serviço não definido"
 
-#: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
-msgstr "Não suportado pelo host"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "Não suportado pelo cliente"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
-msgstr "Recusado pelo cliente"
-
 #: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
-msgstr "Resposta muito extensa"
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
-msgstr "Respostas perdidas"
+msgid "Not supported by host"
+msgstr "Não suportado pelo host"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
-msgstr "Requisição negada"
+msgid "Not supported by client"
+msgstr "Não suportado pelo cliente"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC excedida"
+msgid "Refused by client"
+msgstr "Recusado pelo cliente"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Insufficient rights"
-msgstr "Direitos insuficientes"
+msgid "Reply too big"
+msgstr "Resposta muito extensa"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "In local permit/deny"
-msgstr "Na lista local de utilizadores permitidos/bloqueados"
+msgid "Responses lost"
+msgstr "Respostas perdidas"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Too evil (sender)"
-msgstr "Malvado demais (remetente)"
+msgid "Request denied"
+msgstr "Requisição negada"
 
 #: src/protocols/oscar/oscar.c:200
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC excedida"
+
+#: src/protocols/oscar/oscar.c:201
+msgid "Insufficient rights"
+msgstr "Direitos insuficientes"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "In local permit/deny"
+msgstr "Na lista local de utilizadores permitidos/bloqueados"
+
+#: src/protocols/oscar/oscar.c:203
+msgid "Too evil (sender)"
+msgstr "Malvado demais (remetente)"
+
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "Malvado demais (destinatário)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "Utilizador temporariamente indisponível"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "Nenhum resultado"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "Limite de tamanho da lista excedido"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "Requisição ambígua"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "Fila cheia"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "MI Directa AIM"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
 msgid "Get File"
 msgstr "Receber ficheiro"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "Jogos"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "Enviar lista de contactos"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "Ligação Directa ICQ"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "Utilizador AP"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 Velho"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
 msgstr "Segurança Activada"
 
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "Chat Video"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
 msgstr "Vídeo ao Vivo"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "Camâra"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6625
 msgid "Free For Chat"
 msgstr "Livre Para Conversa"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:6623
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:6624
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "Permitir que outros vejam o seu estado pela Web"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "Comentário de Contacto"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
-msgstr "MI directa com %s fechada"
-
-#: src/protocols/oscar/oscar.c:718
+msgstr "MI Directa com %s fechada"
+
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
-msgstr "MI directa com %s falhou"
-
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+msgstr "MI Directa com %s falhou"
+
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "Ligação Directa falhou"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "MI directa com %s estabelecida"
+
+#: src/protocols/oscar/oscar.c:906
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "Tentando ligar a %s em %s:%hu para MI Directa."
+
+#: src/protocols/oscar/oscar.c:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Pedindo a %s para se ligar a nós em %s:%hu para MI Directa."
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "Impossível abrir MI Directa"
+
+#: src/protocols/oscar/oscar.c:1362
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Seleccionou abrir uma MI Directa com %s."
+
+#: src/protocols/oscar/oscar.c:1366
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Por revelar seu endereço IP, isto pode ser considerado um risco de "
+"privacidade. Deseja continuar?"
+
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+msgid "Connect"
+msgstr "Ligar"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desligado da sala %s."
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "O recurso de Chat está indisponível no momento"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "Não foi possível ligar ao host"
-
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "Nome de utilizador enviado"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7086,45 +7317,45 @@
 "utilizador é inválido.  Nomes de utilizador têem que começar com uma letra e "
 "conter apenas letras, números e espaços, ou conter apenas números."
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "Impossível ligar ao AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "Não foi possível ligar"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "Ligação estabelecida, cookie enviado"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "Impossível estabelecer descritor de ficheiro."
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "Impossível criar nova ligação."
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "Impossível estabelecer socket de escuta."
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
 msgid "Incorrect nickname or password."
 msgstr "Utilizador ou senha incorrecto(a)."
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:2001
 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."
@@ -7132,22 +7363,22 @@
 "esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
 "novamente. Se continuar a tentar, vai ter que esperar ainda mais."
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que está a usar é velha demais. Por favor actualize em %s"
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7156,29 +7387,24 @@
 "Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
 "que isso esteja corrigido. Verifique por actualizações em %s."
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "O Gaim não foi capaz de obter um \"hash\" de ligação AIM válido."
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
 msgstr "O Gaim não foi capaz de obter um hash de ligação válido."
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "MI directa com %s estabelecida"
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
 msgid "(There was an error receiving this message)"
 msgstr "(Houve um erro ao receber esta mensagem)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:3282
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para ligar directamente em %s"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:3285
 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 "
@@ -7188,25 +7414,21 @@
 "para mensagens imediatas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr "Ligar"
-
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:3321
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
 "contactos."
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3329
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3330
 msgid "Please authorize me!"
 msgstr "Por favor autorize-me!"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:3360
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7215,23 +7437,23 @@
 "O utilizador %s requer autorização antes de ser adicionado a uma lista de "
 "contactos. Deseja enviar um pedido de autorização?"
 
-#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
 msgid "Request Authorization"
 msgstr "Pedir autorização"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
+#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6097
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3423
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:3506
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7241,11 +7463,11 @@
 "motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
 msgid "Authorization Request"
 msgstr "Pedido de autorização"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3526
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7256,18 +7478,18 @@
 "pelo seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:3527
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3534
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O utilizador %u aceitou seu pedido para adicioná-lo à sua lista de contactos."
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3542
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7280,7 +7502,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3550
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7293,7 +7515,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7306,34 +7528,34 @@
 "A mensagem é: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O utilizador de ICQ %u mandou-lhe um contacto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3585
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Quer adicionar este contacto à sua lista de contactos?"
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3589
 msgid "Decline"
 msgstr "Rejeitar"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3674
 #, 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] "Perdeu %hu mensagem de %s por que era inválida."
 msgstr[1] "Perdeu %hu mensagens de %s por que eram inválidas."
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3683
 #, 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] "Perdeu %hu mensagem de %s porque era muito extensa."
 msgstr[1] "Perdeu %hu mensagens de %s porque eram muito extensas."
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3692
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7344,72 +7566,70 @@
 msgstr[1] ""
 "Perdeu %hu mensagens de %s porque o limite de frequência foi excedido."
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3701
 #, 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] "Perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3710
 #, 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] "Perdeu %hu mensagem de %s porque é muito malvado."
 msgstr[1] "Perdeu %hu mensagens de %s porque é muito malvado."
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3719
 #, 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] "Perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:3189
+#: src/protocols/oscar/oscar.c:3780
 #, 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:3248
+#: src/protocols/oscar/oscar.c:3839
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Erro do SNAC: %s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3840
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3875
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "A sua mensagem para %s não foi enviada:"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3934
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informação do utilizador %s indisponível:"
 
-#: src/protocols/oscar/oscar.c:3366
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3957
 msgid "Warning Level"
-msgstr "Mostrar _níveis de alerta"
-
-#: src/protocols/oscar/oscar.c:3369
-#, fuzzy
+msgstr "Nível de Alerta"
+
+#: src/protocols/oscar/oscar.c:3960
 msgid "Online Since"
-msgstr "Ligado desde"
-
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgstr "Desligado Desde"
+
+#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
-msgstr "Membro desde"
-
-#: src/protocols/oscar/oscar.c:3455
+msgstr "Membro Desde"
+
+#: src/protocols/oscar/oscar.c:4046
 msgid "Your AIM connection may be lost."
 msgstr "A sua ligação AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:4232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7417,11 +7637,11 @@
 "[Incapaz de mostrar uma mensagem deste utilizador porque continha caracteres "
 "inválidos.]"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4450
 msgid "Rate limiting error."
 msgstr "Erro na limitação da taxa."
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7429,116 +7649,120 @@
 "A última ação que tentou não pôde ser executada porque excedeu a taxa "
 "limite. Por favor espere 10 segundos e tente novamente."
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:4514
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 "Foi desligado porque ligou-se de outro local com o mesmo nome de utilizador."
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:4516
 msgid "You have been signed off for an unknown reason."
 msgstr "Foi desligado por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:4547
 msgid "Finalizing connection"
 msgstr "Terminando ligação"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
 msgid "Email Address"
 msgstr "Endereço de email"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4830
+msgid "Not specified"
+msgstr "Não especificado"
+
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Feminino"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Masculino"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4847
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4851
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4856
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4864
 msgid "Work Address"
 msgstr "Endereço do trabalho"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4872
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4873
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4874
 msgid "Division"
 msgstr "Divisão"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4875
 msgid "Position"
 msgstr "Posição"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4877
 msgid "Web Page"
 msgstr "Página da web"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4883
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informações ICQ de %s:"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4933
 msgid "Pop-Up Message"
 msgstr "Mensagem de Pop-Up"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Os nomes de utilizador seguintes estão associados a %s"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4958
 msgid "Search Results"
 msgstr "Resultados da Procura"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nenhum resultado encontrado para o endereço de email %s"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Deve receber um email pedindo para confirmar %s."
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4998
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5026
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7547,7 +7771,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "difere do original."
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7556,7 +7780,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "termina com um espaço."
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7565,7 +7789,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "é muito extenso."
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7574,7 +7798,7 @@
 "Erro 0x%04x: Impossível mudar endereço de email porque já existe um pedido "
 "pendente para esse nome de utilizador."
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7583,7 +7807,7 @@
 "Erro 0x%04x: Impossível mudar o endereço de email porque este já possui "
 "muitos nomes de utilizador associados a ele."
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7591,12 +7815,12 @@
 msgstr ""
 "Erro 0x%04x: Impossível mudar o endereço de email porque este é inválido."
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7605,20 +7829,27 @@
 "Actualmente, o seu nome de utilizador está formatado desta maneira:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endereço de email de %s é %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:5128
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"A sua Imagem MI não foi enviada. Tem de estar Directamente Ligado para "
+"enviar Imagens MI."
+
+#: src/protocols/oscar/oscar.c:5301
 msgid "Unable to set AIM profile."
 msgstr "Impossivel definir perfil AIM."
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:5302
 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 "
@@ -7628,7 +7859,7 @@
 "procedimento de ligação ser concluído. O seu perfil continua o mesmo; tente "
 "defini-lo novamente quando estiver totalmente ligado."
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7643,19 +7874,19 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. O Gaim truncou-o "
 "por si."
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5334
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
 msgid "Visible"
 msgstr "Visível"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:5368
 msgid "Unable to set AIM away message."
 msgstr "Impossível definir mensagem de ausência do AIM."
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7665,7 +7896,7 @@
 "do procedimento de ligação ser concluído. Permanece com um estado \"presente"
 "\"; tente defini-lo novamente quando estiver totalmente ligado."
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:5409
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7680,11 +7911,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. O Gaim "
 "truncou-a e definiu seu estado como ausente."
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5414
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:5500
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7695,16 +7926,16 @@
 "Nomes de utilizador têem que começar com uma letra e conter apenas letras, "
 "números e espaços, ou conter apenas números."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5931
 msgid "Unable To Add"
 msgstr "Impossível adicionar"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossível recuperar lista de contactos"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -7714,13 +7945,13 @@
 "momento. Sua lista de contactos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7729,11 +7960,11 @@
 "Não foi possível adicionar o contacto %s porque tem muitos contactos na sua "
 "lista de contactos. Por favor remova um e tente novamente."
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5930
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7744,7 +7975,7 @@
 "motivo mais comum para isso é que tem o número máximo de contactos permitido "
 "na sua lista de contactos."
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6012
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7753,11 +7984,11 @@
 "O utilizador %s deu-lhe permissão para adicioná-lo à sua lista de contactos. "
 "Deseja adicioná-lo?"
 
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:6018
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6051
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7768,19 +7999,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6093
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O utilizador %s aceitou o seu pedido para adicioná-lo à sua lista de "
 "contactos."
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6094
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6097
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7791,86 +8022,74 @@
 "pelo seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6098
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:6157
 msgid "Invalid chat name specified."
 msgstr "O nome de chat especificado é inválido."
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6247
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"A sua Imagem MI não foi enviada. Não pode enviar Imagens MI em chats AIM."
+
+#: src/protocols/oscar/oscar.c:6404
 msgid "Away Message"
 msgstr "Mensagem de Ausência"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr "Impossível abrir MI Directa"
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Seleccionou abrir uma MI Directa com %s."
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Por revelar seu endereço IP, isto pode ser considerado um risco de "
-"privacidade. Deseja continuar?"
-
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6688
 msgid "Buddy Comment:"
 msgstr "Comentário de Contacto:"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6706
 msgid "Edit Buddy Comment"
 msgstr "Editar Comentário de Contacto"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6712
 msgid "Get Status Msg"
 msgstr "Ver Msg de Estado"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6724
 msgid "Direct IM"
 msgstr "MI Directa"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6747
 msgid "Re-request Authorization"
 msgstr "Re-requisitar Autorização"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6777
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6778
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome de utilizador pode mudar apenas a capitalização e os "
 "espaços em branco."
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6785
 msgid "New screen name formatting:"
 msgstr "Nova formatação do nome do utilizador:"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6837
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6882
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>não está à espera de autorização</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6885
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Está à espera de autorização dos seguintes contactos"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6886
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7878,75 +8097,75 @@
 "Pode re-requisitar autorização destes contactos clicando com o botão direito "
 "neles e seleccionando \"Re-requisitar autorização.\""
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6903
 msgid "Find Buddy by E-mail"
 msgstr "Encontrar Contacto por E-mail"
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6904
 msgid "Search for a buddy by e-mail address"
 msgstr "Pesquisar Contactos por morada de e-mail"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6905
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite a morada de e-mail do contacto que pesquisa."
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6922
 msgid "Available Message:"
 msgstr "Mensagem de 'Disponível':"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6923
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Estou a trabalhar e esperando uma distracção--mandem-me uma MI!"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7004
 msgid "Set User Info..."
 msgstr "Definir Informações de Utilizador..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7009
 msgid "Set User Info (URL)..."
 msgstr "Definir Info de Utilizador (URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:7015
 msgid "Set Available Message..."
 msgstr "Definir Mensagem Disponível..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7020
 msgid "Change Password..."
 msgstr "Alterar Senha..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7025
 msgid "Change Password (URL)"
 msgstr "Mudar Senha (URL)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:7029
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar Redirecção de MI (URL)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7038
 msgid "Format Screen Name..."
 msgstr "Formatar Nome de Utilizador..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:7042
 msgid "Confirm Account"
 msgstr "Confirmar Conta"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7046
 msgid "Display Currently Registered Address"
 msgstr "Mostrar o Endereço Registado Actualmente"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:7050
 msgid "Change Currently Registered Address..."
 msgstr "Mudar o Endereço Registado Actualmente"
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7057
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar contactos esperando autorização"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:7063
 msgid "Search for Buddy by Email..."
 msgstr "Procurar Contacto por Email"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7068
 msgid "Search for Buddy by Information"
 msgstr "Procurar Contacto por Informação"
 
@@ -7961,124 +8180,1132 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin do protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7204
 msgid "Auth host"
 msgstr "Host de autorização"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7209
 msgid "Auth port"
 msgstr "Porto de autorização"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
+#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "O utilizador %s não está presente na rede"
+
+#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
+#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+msgid "Key Agreement"
+msgstr "Acordo de Chave"
+
+#: src/protocols/silc/buddy.c:49
+msgid "Cannot perform the key agreement"
+msgstr "Impossível efectuar o acordo de chave"
+
+#: src/protocols/silc/buddy.c:106
+msgid "Error occurred during key agreement"
+msgstr "Ocorreu um erro durante o acordo de chave"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Key Agreement failed"
+msgstr "Acordo de Chave dalhou"
+
+#: src/protocols/silc/buddy.c:115
+msgid "Timeout during key agreement"
+msgstr "Tempo expirou durante o acordo de chave"
+
+#: src/protocols/silc/buddy.c:120
+msgid "Key agreement was aborted"
+msgstr "Acordo de chave foi abortado"
+
+#: src/protocols/silc/buddy.c:125
+msgid "Key agreement is already started"
+msgstr "Acordo de chave já foi iniciado"
+
+#: src/protocols/silc/buddy.c:130
+msgid "Key agreement cannot be started with yourself"
+msgstr "Acordo de chave não pode ser iniciado consigo próprio"
+
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
+#: src/protocols/silc/buddy.c:500
+msgid "The remote user is not present in the network any more"
+msgstr "O Utilizador remoto já não está presente na rede"
+
+#: src/protocols/silc/buddy.c:284
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Pedido de acordo de chave recebido de %s. Gostaria de efectuar o acordo de "
+"chave?"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"O utilizador remoto está à espera do acordo de chave em:\n"
+"Anfitrião remoto: %s\n"
+"Porto remoto: %d"
+
+#: src/protocols/silc/buddy.c:301
+msgid "Key Agreement Request"
+msgstr "Pedido de Acordo de Chave"
+
+#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
+#: src/protocols/silc/buddy.c:451
+msgid "IM With Password"
+msgstr "MI Com Senha"
+
+#: src/protocols/silc/buddy.c:410
+msgid "Cannot set IM key"
+msgstr "Impossível definir chave de MI"
+
+#: src/protocols/silc/buddy.c:452
+msgid "Set IM Password"
+msgstr "Definit Senha de IM"
+
+#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+msgid "Get Public Key"
+msgstr "Obter Chave Pública"
+
+#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
+msgid "Cannot fetch the public key"
+msgstr "Impossível obter a chave pública"
+
+#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+msgid "Show Public Key"
+msgstr "Mostrar Chave Pública"
+
+#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/chat.c:218
+msgid "Could not load public key"
+msgstr "Impossível carregar chave pública"
+
+#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
+msgid "User Information"
+msgstr "Informação do Utilizador"
+
+#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+msgid "Cannot get user information"
+msgstr "Incapaz de obter informação do utilizador"
+
+#: src/protocols/silc/buddy.c:722
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "O contacto %s não é confiado"
+
+#: src/protocols/silc/buddy.c:725
+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 ""
+"Não pode receber notificações de um contacto antes de importar a sua chave "
+"pública.  Pode usar o comando Obter Chave Pública para obter a chave pública."
+
+#: src/protocols/silc/buddy.c:1025
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "O contacto %s não está presente na rede"
+
+#: src/protocols/silc/buddy.c:1028
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Para adicionar o contacto tem que importar a sua chave pública. Carregue em "
+"Importar para importar uma chave pública."
+
+#: src/protocols/silc/buddy.c:1031
+msgid "Import..."
+msgstr "Importar..."
+
+#: src/protocols/silc/buddy.c:1118
+msgid "Select correct user"
+msgstr "Escolha o utilizador correcto"
+
+#: src/protocols/silc/buddy.c:1120
+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 ""
+"Foram encontrados mais do que um utilizador com a mesma chave pública.  "
+"Escolha o utilizador correcto da lista para adicionar à lista de contactos."
+
+#: src/protocols/silc/buddy.c:1122
+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 ""
+"Foram encontrados mais do que um utilizador com o mesmo nome.  Escolha o "
+"utilizador correcto da lista para adicionar à lista de contactos."
+
+#: src/protocols/silc/buddy.c:1396
+msgid "Detached"
+msgstr "Desligado"
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "Indisposto"
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "Acorde-me"
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "Hiper-Activo"
+
+#: src/protocols/silc/buddy.c:1408
+msgid "Robot"
+msgstr "Robot"
+
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/silc.c:606
+msgid "Happy"
+msgstr "Feliz"
+
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/silc.c:608
+msgid "Sad"
+msgstr "Triste"
+
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/silc.c:610
+msgid "Angry"
+msgstr "Zangado"
+
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/silc.c:612
+msgid "Jealous"
+msgstr "Invejoso"
+
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/silc.c:614
+msgid "Ashamed"
+msgstr "Envergonhado"
+
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/silc.c:616
+msgid "Invincible"
+msgstr "Invencível"
+
+#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/silc.c:618
+msgid "In Love"
+msgstr "Apaixonado"
+
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:620
+msgid "Sleepy"
+msgstr "Sonolento"
+
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:622
+msgid "Bored"
+msgstr "Entediado"
+
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/silc.c:624
+msgid "Excited"
+msgstr "Excitado"
+
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/silc.c:626
+msgid "Anxious"
+msgstr "Ansioso"
+
+#: src/protocols/silc/buddy.c:1471
+msgid "Modes"
+msgstr "Modos"
+
+#: src/protocols/silc/buddy.c:1481
+msgid "Mood"
+msgstr "Disposição"
+
+#: src/protocols/silc/buddy.c:1511
+msgid "Status Text"
+msgstr "Estado Texto"
+
+#: src/protocols/silc/buddy.c:1516
+msgid "Preferred Contact"
+msgstr "Contacto Preferido"
+
+#: src/protocols/silc/buddy.c:1524
+msgid "Paging"
+msgstr "Paging"
+
+#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "Vídeo Conferência"
+
+#: src/protocols/silc/buddy.c:1537
+msgid "Preferred Language"
+msgstr "Língua Preferida"
+
+#: src/protocols/silc/buddy.c:1542
+msgid "Device"
+msgstr "Dispositivo"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Computer"
+msgstr "Computador"
+
+#: src/protocols/silc/buddy.c:1548
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1550
+msgid "Terminal"
+msgstr "Terminal"
+
+#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "Fuzo Horário"
+
+#: src/protocols/silc/buddy.c:1567
+msgid "Geolocation"
+msgstr "Geolocalização"
+
+#: src/protocols/silc/buddy.c:1626
+msgid "Reset IM Key"
+msgstr "Redefinir chave de MI"
+
+#: src/protocols/silc/buddy.c:1631
+msgid "IM with Key Exchange"
+msgstr "MI com Troca de Chave"
+
+#: src/protocols/silc/buddy.c:1635
+msgid "IM with Password"
+msgstr "MI com Senha"
+
+#: src/protocols/silc/buddy.c:1646
+msgid "Get Public Key..."
+msgstr "Obter Chave Pública..."
+
+#: src/protocols/silc/buddy.c:1651
+msgid "Send File..."
+msgstr "Enviar Ficheiro..."
+
+#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+msgid "Kill User"
+msgstr "Matar Utilizador"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "_Senha:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "O canal %s não existe na rede"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
+msgid "Channel Information"
+msgstr "Informação do Canal"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "Incapaz de obter informação do canal"
+
+#: src/protocols/silc/chat.c:217
+msgid "Add Channel Public Key"
+msgstr "Adicionar Chave Pública do Canal"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:272
+msgid "Open Public Key..."
+msgstr "Abrir Chave Pública..."
+
+#: src/protocols/silc/chat.c:383
+msgid "Channel Passphrase"
+msgstr "Senha do Canal"
+
+#: src/protocols/silc/chat.c:390
+msgid "Channel Public Keys List"
+msgstr "Lista de Chaves Públicas do Canal"
+
+#: src/protocols/silc/chat.c:395
+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 ""
+"Autenticação de canal é usada para proteger o canal de acesso não-"
+"autorizado. A autenticação pode ser baseada em senha ou assinaturas "
+"digitais. Se definir senha, é obrigatória a capacidade de se juntar. Se "
+"definir chaves públicas do canal, então apenas os utilizadores cujas chaves "
+"públicas estejam listadas são capazes de se juntar."
+
+#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:873
+msgid "Channel Authentication"
+msgstr "Autenticação do Canal"
+
+#: src/protocols/silc/chat.c:562
+msgid "Group Name"
+msgstr "Nome do Grupo"
+
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+msgid "Passphrase"
+msgstr "Senha"
+
+#: src/protocols/silc/chat.c:577
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Por favor digite o nome de grupo privado e senha do canal %s."
+
+#: src/protocols/silc/chat.c:579
+msgid "Add Channel Private Group"
+msgstr "Adicionar Grupo Privado do Canal"
+
+#: src/protocols/silc/chat.c:706
+msgid "User Limit"
+msgstr "Limite de Utilizadores"
+
+#: src/protocols/silc/chat.c:707
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"Define o limite de utilizadores no canal. Defina para zero para ser "
+"ilimitado."
+
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "Ver info"
+
+#: src/protocols/silc/chat.c:856
+msgid "Invite List"
+msgstr "Lista de Convites"
+
+#: src/protocols/silc/chat.c:860
+msgid "Ban List"
+msgstr "Lista de Banidos"
+
+#: src/protocols/silc/chat.c:867
+msgid "Add Private Group"
+msgstr "Adicionar Grupo Privado"
+
+#: src/protocols/silc/chat.c:878
+msgid "Reset Permanent"
+msgstr "Apagar Permanente"
+
+#: src/protocols/silc/chat.c:882
+msgid "Set Permanent"
+msgstr "Definir Permanente"
+
+#: src/protocols/silc/chat.c:889
+msgid "Set User Limit"
+msgstr "Definir Limite de Utilizadores"
+
+#: src/protocols/silc/chat.c:894
+msgid "Reset Topic Restriction"
+msgstr "Apagar Restrição de Tópico"
+
+#: src/protocols/silc/chat.c:898
+msgid "Set Topic Restriction"
+msgstr "Definir Restrição de Tópico"
+
+#: src/protocols/silc/chat.c:904
+msgid "Reset Private Channel"
+msgstr "Apagar Canal Privado"
+
+#: src/protocols/silc/chat.c:908
+msgid "Set Private Channel"
+msgstr "Definir Canal Privado"
+
+#: src/protocols/silc/chat.c:914
+msgid "Reset Secret Channel"
+msgstr "Apagar Canal Secreto"
+
+#: src/protocols/silc/chat.c:918
+msgid "Set Secret Channel"
+msgstr "Definir Canal Secreto"
+
+#: src/protocols/silc/chat.c:988
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "É o fundador de canal em <I>%s</I>."
+
+#: src/protocols/silc/chat.c:992
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "O fundador de canal em <I>%s</I> é <I>%s</I>"
+
+#: src/protocols/silc/chat.c:1042
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"Tem que se juntar ao canal %s antes de se poder juntar ao grupo privado"
+
+#: src/protocols/silc/chat.c:1044
+msgid "Join Private Group"
+msgstr "Juntar-se ao Grupo Privado"
+
+#: src/protocols/silc/chat.c:1045
+msgid "Cannot join private group"
+msgstr "Impossível juntar-se ao grupo privado"
+
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+msgid "Cannot call command"
+msgstr "Incapaz de chamar comando"
+
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+msgid "Unknown command"
+msgstr "Comando desconhecido"
+
+#: 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:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "Transferência de Ficheiro Segura"
+
+#: 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 "Erro durante a transferência de ficheiro"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "Não tem permissão"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "Acordo de chave falhou"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "Sessões de transferência de ficheiro não existem"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "Nenhuma sessão de transferência de ficheiro activa"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "Transferência de ficheiro já foi iniciada"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+"Não foi possível efectuar o acordo de chave para a transferência de ficheiro"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "Não foi possível iniciar a transferência de ficheiro"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "Impossível enviar ficheiro"
+
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s mudou o tópico de <I>%s</I> para: %s"
+
+#: src/protocols/silc/ops.c:398
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> definiu modos do canal <I>%s</I> para: %s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Foi expulso de <I>%s</I> por <I>%s</I> (%s)"
+
+#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "Foi morto por %s (%s)"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "Morto por %s (%s)"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "Desligar do servidor"
+
+#: src/protocols/silc/ops.c:767
+msgid "Personal Information"
+msgstr "Informação Pessoal"
+
+#: src/protocols/silc/ops.c:790
+msgid "Birth Day"
+msgstr "Data de Nascimento"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "Título"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "Emprego"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "Organização"
+
+#: src/protocols/silc/ops.c:806
+msgid "Unit"
+msgstr "unidade"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "EMail"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "Nota"
+
+#: src/protocols/silc/ops.c:878
+msgid "Join Chat"
+msgstr "Entrar no Chat"
+
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "Nome de Anfitrião"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "Modo de Utilizador"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "Canais"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "Impressão Digital da Chave Pública"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "Babbleprint da Chave Pública"
+
+#: src/protocols/silc/ops.c:995
+msgid "More..."
+msgstr "Mais..."
+
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+msgid "Detach From Server"
+msgstr "Desligar Do Servidor"
+
+#: src/protocols/silc/ops.c:1006
+msgid "Cannot detach"
+msgstr "Impossível desligar"
+
+#: src/protocols/silc/ops.c:1017
+msgid "Cannot set topic"
+msgstr "Impossível definir tópico"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Roomlist"
+msgstr "Lista de Salas"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Cannot get room list"
+msgstr "Incapaz de obter a lista de salas"
+
+#: src/protocols/silc/ops.c:1093
+msgid "No public key was received"
+msgstr "Não foi recebida nenhuma chave pública"
+
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
+msgid "Server Information"
+msgstr "Informação do servidor"
+
+#: src/protocols/silc/ops.c:1107
+msgid "Cannot get server information"
+msgstr "Incapaz de obter informação do servidor"
+
+#: src/protocols/silc/ops.c:1128
+msgid "Could not kill user"
+msgstr "Não foi possível matar o utilizador"
+
+#: src/protocols/silc/ops.c:1205
+msgid "Error during connecting to SILC Server"
+msgstr "Erro durante a ligação ao servidor SILC"
+
+#: src/protocols/silc/ops.c:1210
+msgid "Key Exchange failed"
+msgstr "Troca de Chaves falhou"
+
+#: src/protocols/silc/ops.c:1219
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"O resumo da sessão desligada falhou. Carregue em Religar para criar uma nova "
+"ligação."
+
+#: src/protocols/silc/ops.c:1254
+msgid "Disconnected by server"
+msgstr "Desligado pelo servidor"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "Resumindo sessão"
+
+#: src/protocols/silc/ops.c:1316
+msgid "Authenticating connection"
+msgstr "Autenticando ligação"
+
+#: src/protocols/silc/ops.c:1363
+msgid "Verifying server public key"
+msgstr "Verificando a chave pública do servidor"
+
+#: src/protocols/silc/ops.c:1404
+msgid "Passphrase required"
+msgstr "Senha requerida"
+
+#: src/protocols/silc/ops.c:1433
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Falha: Versão difere, actualize o seu cliente"
+
+#: src/protocols/silc/ops.c:1436
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Falha: Servidor remoto não confia/suporta a sua chave pública"
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Falha: Servidor remoto não suporta o grupo KE proposto"
+
+#: src/protocols/silc/ops.c:1442
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Falha: Servidor remoto não suporta a cifra proposta"
+
+#: src/protocols/silc/ops.c:1445
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Falha: Servidor remoto não suporta o PKCS proposto"
+
+#: src/protocols/silc/ops.c:1448
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Falha: Servidor remoto não suporta a função de hash proposta"
+
+#: src/protocols/silc/ops.c:1451
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Falha: Servidor remoto não suporta HMAC proposto"
+
+#: src/protocols/silc/ops.c:1453
+msgid "Failure: Incorrect signature"
+msgstr "Falha: Assinatura incorrecta"
+
+#: src/protocols/silc/ops.c:1455
+msgid "Failure: Invalid cookie"
+msgstr "Falha: Cookie inválido"
+
+#: src/protocols/silc/ops.c:1466
+msgid "Failure: Authentication failed"
+msgstr "Falha: Autenticação falhada"
+
+#: 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?"
+msgstr ""
+"A chave pública de %s foi recebida. A sua cópia local é diferente. Ainda "
+"assim gostaria de aceitar esta chave pública?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+"A chave pública de %s foi recebida. Gostaria de aceitar esta chave pública?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Impressão digital e Babbleprint da chave %s são:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "Verificar Chave Pública"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "Ver..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "Tipo de chave pública não suportado"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "Ligação falhou"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "Incapaz de iniciar ligaçao de cliente SILC"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "Efectuando a troca de chaves"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "Sem memória"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "Ligando ao Servidor SILC"
+
+#: src/protocols/silc/silc.c:602
+msgid "Your Current Mood"
+msgstr "A Sua Disposição Actual"
+
+#: src/protocols/silc/silc.c:604
+msgid "Normal"
+msgstr "Normal"
+
+#: src/protocols/silc/silc.c:629
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Os Seus Métodos De Contacto Preferidos"
+
+#: src/protocols/silc/silc.c:646
+msgid "Your Current Status"
+msgstr "O Seu Estado Actual"
+
+#: src/protocols/silc/silc.c:653
+msgid "Online Services"
+msgstr "Serviços Online"
+
+#: src/protocols/silc/silc.c:656
+msgid "Let others see what services you are using"
+msgstr "Deixar que outros vejam os serviços que etsá a usar"
+
+#: src/protocols/silc/silc.c:662
+msgid "Let others see what computer you are using"
+msgstr "Deixar que outros vejam que computador está a usar"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your VCard File"
+msgstr "O Seu Ficheiro VCard"
+
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+msgid "User Online Status Attributes"
+msgstr "Atributos do Estado Online do Utilizador"
+
+#: src/protocols/silc/silc.c:684
+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 ""
+"Pode deixar que os outros utilizadores vejam a informação do seu estado "
+"online e a sua informação pessoal. Por favor preencha a informação que "
+"gostaria que os outros utilizadores vejam."
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+msgid "Message of the Day"
+msgstr "Mensagem do Dia"
+
+#: src/protocols/silc/silc.c:723
+msgid "No Message of the Day available"
+msgstr "Nenhuma Mensagem do Dia disponível"
+
+#: src/protocols/silc/silc.c:724
+msgid "There is no Message of the Day associated with this connection"
+msgstr "Não há nenhuma Mensagem do Dia associada a esta ligação"
+
+#: src/protocols/silc/silc.c:740
+msgid "Online Status"
+msgstr "Estado Online"
+
+#: src/protocols/silc/silc.c:749
+msgid "View Message of the Day"
+msgstr "Ver Mensagem do Dia"
+
+#: src/protocols/silc/silc.c:813
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "Utilizador <I>%s</I> não está presente na rede"
+
+#: src/protocols/silc/silc.c:907
+msgid "Instant Messages"
+msgstr "Mensagens Instantâneas"
+
+#: src/protocols/silc/silc.c:912
+msgid "Digitally sign all IM messages"
+msgstr "Assinar digitalmente todas as mensagens MI"
+
+#: src/protocols/silc/silc.c:917
+msgid "Verify all IM message signatures"
+msgstr "Verificar as assinaturas de todas as mensagens MI"
+
+#: src/protocols/silc/silc.c:920
+msgid "Channel Messages"
+msgstr "Mensagens do Canal"
+
+#: src/protocols/silc/silc.c:925
+msgid "Digitally sign all channel messages"
+msgstr "Assinar digitalmente todas as mensagens de canal"
+
+#: src/protocols/silc/silc.c:930
+msgid "Verify all channel message signatures"
+msgstr "Verificar as assinaturas de todas as mensagens de canal"
+
+#: src/protocols/silc/silc.c:933
+msgid "Default SILC Key Pair"
+msgstr "Par de Chaves por Omissão SILC"
+
+#: src/protocols/silc/silc.c:938
+msgid "SILC Public Key"
+msgstr "Chave Pública SILC"
+
+#: src/protocols/silc/silc.c:943
+msgid "SILC Private Key"
+msgstr "Chave Privada SILC"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1026
+msgid "SILC Protocol Plugin"
+msgstr "Plugin do Protocolo SILC"
+
+#. *  description
+#: src/protocols/silc/silc.c:1028
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Protocolo de Conferência ao Vivo na Internet Seguro (SILC)"
+
+#: src/protocols/silc/silc.c:1058
+msgid "Public key authentication"
+msgstr "Autenticação por chave pública"
+
+#: src/protocols/silc/silc.c:1064
+msgid "Public Key File"
+msgstr "Ficheiro de Chave Pública"
+
+#: src/protocols/silc/silc.c:1068
+msgid "Private Key File"
+msgstr "Ficheiro de Chave Privada"
+
+#: src/protocols/silc/silc.c:1073
+msgid "Reject watching by other users"
+msgstr "Rejeitar visualização por outros utilizadores"
+
+#: src/protocols/silc/silc.c:1076
+msgid "Block invites"
+msgstr "Bloquear convites"
+
+#: src/protocols/silc/silc.c:1079
+msgid "Block IMs without Key Exchange"
+msgstr "Bloquear MIs sem Troca de Chaves"
+
+#: src/protocols/silc/silc.c:1082
+msgid "Reject online status attribute requests"
+msgstr "Rejeitar pedidos de atributos de estado online"
+
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+msgid "Creating SILC key pair..."
+msgstr "Criando o par de chaves SILC..."
+
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "Nome Real"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "Nome de Utilizador"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "Nome do Anfitrião"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "Algoritmo"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "Comprimento da Chave"
+
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+msgid "Public Key Information"
+msgstr "Informação de Chave Pública"
+
+#: src/protocols/toc/toc.c:166
 #, c-format
 msgid "Looking up %s"
-msgstr "Procurando por %s"
-
-#: src/protocols/toc/toc.c:510
+msgstr "Procurando %s"
+
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossível escrever ficheiro %s."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossível ler ficheiro %s."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensagem muito extensa, últimos %s bytes truncados."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s não está ligado no momento."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Alertar %s não é permitido."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Uma mensagem foi descartada, está a exceder o limite de velocidade do "
 "servidor."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat não disponível em %s."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Está a mandar mensagens muito rapidamente para %s."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Perdeu uma MI de %s porque era muito extensa."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Perdeu uma MI de %s porque foi enviada muito rapidamente."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:539
 msgid "Failure."
 msgstr "Falha."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:542
 msgid "Too many matches."
 msgstr "Muitos resultados."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:545
 msgid "Need more qualifiers."
 msgstr "Necessários mais qualificadores."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:548
 msgid "Dir service temporarily unavailable."
 msgstr "Serviço de diretorio temporariamente indisponível."
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 msgid "Email lookup restricted."
 msgstr "Pesquisa por email restrita."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 msgid "Keyword ignored."
 msgstr "Palavra-chave ignorada."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:557
 msgid "No keywords."
 msgstr "Nenhuma palavra-chave."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:560
 msgid "User has no directory information."
 msgstr "Utilizador não tem informação de directório."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:564
 msgid "Country not supported."
 msgstr "País não suportado."
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:567
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falha desconhecida: %s."
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:573
 msgid "The service is temporarily unavailable."
 msgstr "O serviço está temporariamente indisponível."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:576
 msgid "Your warning level is currently too high to log in."
 msgstr "O seu nível de alerta é alto demais para que possa ligar-se."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:579
 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."
@@ -8086,37 +9313,37 @@
 "Esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
 "novamente. Se continuar a tentar, vai ter que esperar ainda mais."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:581
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Um erro desconhecido ocorreu ao ligar: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:604
 msgid "Connection Closed"
 msgstr "Ligação fechada"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:644
 msgid "Waiting for reply..."
 msgstr "Esperando resposta..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:714
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "O TOC voltou de sua pausa. Agora pode mandar mensagens novamente."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:902
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
+#: src/protocols/toc/toc.c:906
+msgid "TOC has sent a PAUSE command."
+msgstr "O TOC enviou um comando PAUSE."
+
 #: src/protocols/toc/toc.c:907
-msgid "TOC has sent a PAUSE command."
-msgstr "O TOC enviou um comando PAUSE."
-
-#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -8127,47 +9354,47 @@
 "qualquermensgem seja enviada. Isto é apenas temporário, por favor seja "
 "paciente."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1417
 msgid "Get Dir Info"
 msgstr "Ver informações de directório"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1553
 msgid "Set Dir Info"
 msgstr "Definir informações de directório"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1675
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Não foi possível abrir %s para escrita!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1711
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
+#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
 msgid "Could not connect for transfer."
 msgstr "Não foi possível ligar para transferência."
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1953
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Não foi possível escrever cabeçalho de ficheiro. O ficheiro não será "
 "transferido."
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2053
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar como..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pede a %s para aceitar %d ficheiro: %s (%.2f %s)%s%s"
 msgstr[1] "%s pede a %s para aceitar %d ficheiros: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2094
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pede para lhe enviar um ficheiro"
@@ -8183,15 +9410,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2195
 msgid "TOC host"
 msgstr "Host TOC"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2199
 msgid "TOC port"
 msgstr "Porto TOC"
 
@@ -8248,7 +9475,7 @@
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "Definir perfil"
 
@@ -8275,37 +9502,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin do protocolo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:307
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 "Foi desligado porque se ligou a partir de outro computador ou aparelho."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "A sua mensagem do Yahoo! não foi enviada."
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "mensage de sistema Yahoo! para %s:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:868
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s negaram (rectroactivamente) o seu pedido para adicioná-los à sua lista."
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:871
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8314,11 +9541,11 @@
 "%s negaram (rectroactivamente) o seu pedido para adicioná-los à sua lista de "
 "contactos pelo seguinte motivo: %s."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "Adicionar Contacto rejeitado"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1601
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8329,11 +9556,11 @@
 "Esta versão do Gaim provávelmente não vai conseguir registar-se no Yahoo "
 "comm sucesso. Veja %s para actualizações."
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Autenticação no Yahoo! Falhou"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1677
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8342,77 +9569,77 @@
 "Tentou ignorar %s, mas o utilizador está na sua lista de contactos. Clicando "
 "\"Sim\" vai remover e ignorar o contacto."
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "Ignorar contacto?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "Nome de utilizador inválido"
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "Senha incorrecta."
 
-#: src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1719
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "A sua conta está trancada, por favor ligue-se ao website da yahoo."
 
-#: src/protocols/yahoo/yahoo.c:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Número de erro desconhecido %d."
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1779
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossível adicionar contacto %s ao grupo %s à lista do servidor da conta %s."
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "Impossível adicionar contacto à lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
 msgid "Unable to read"
 msgstr "Inpossível ler"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
+#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Problema na ligação"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Not At Desk"
 msgstr "Não estou por perto"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2776
 msgid "Not In Office"
 msgstr "Fora do escritório"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "On Vacation"
 msgstr "De férias"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -8421,39 +9648,39 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "Entrar no Chat"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "Iniciar Conferência"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "Activar qual ID?"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "Juntar a quem no chat?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "Juntar a um utilizador num chat..."
 
-#: src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:2973
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
-"<b>Desculpe, perfis marcados como contendo conteúdo adulto não são "
-"suportados actualmente.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+"<b>Lamentamos, perfis marcados como contendo conteúdo adulto não são "
+"suportados neste momento.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -8461,41 +9688,41 @@
 "Se deseja ver este perfil, terá que visitar este elo no seu navegador da "
 "web<br>"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2996
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
-"<b>Desculpe, perfis que não estão na língua inglesa não são suportados "
-"actualmente.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+"<b>Lamentamos, perfis que não estão na língua inglesa não são suportados "
+"neste momento.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
 msgid "Yahoo! ID"
 msgstr "ID do Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/yahoo/yahoo.c:3095
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
 msgid "Latest News"
 msgstr "Última(s) notícia(s)"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
-msgstr "Página da web"
-
-#: src/protocols/yahoo/yahoo.c:3076
+msgstr "Página Inicial"
+
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
-msgstr "Link fixe 1"
-
-#: src/protocols/yahoo/yahoo.c:3080
+msgstr "Elo Fixe 1"
+
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
-msgstr "Link legal 2"
-
-#: src/protocols/yahoo/yahoo.c:3082
+msgstr "Elo Fixe 2"
+
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
-msgstr "Link legal 3"
+msgstr "Elo Fixe 3"
 
 #. *< api_version
 #. *< type
@@ -8508,27 +9735,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "Host do pager"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "Porto do pager"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "Servidor de transferências de ficheiros"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "Porto de transferências de ficheiros"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "Url da Lista de Salas de Chat"
 
@@ -8595,34 +9822,34 @@
 msgid "User Rooms"
 msgstr "Salas do Utilizador"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilizador:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
+#: src/protocols/zephyr/zephyr.c:560
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Nome:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisível ou desligado"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Em %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "Já ligado ao Zepyhr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8630,19 +9857,15 @@
 "Por o Zephyr usar o seu nome do utilizador do sistema, não pode ter "
 "múltiplas contas nele enquanto estiver logado com o mesmo utilizador."
 
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr "ZLocate"
-
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1191
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "_Instância:"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "_Destinatário:"
 
@@ -8657,37 +9880,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin do protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "Exportar para .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr "Exportar para .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "Exposição"
 
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "Acesso negado: servidor proxy proíbe túneis no porto 80."
-
-#: src/proxy.c:957
+#: src/proxy.c:853
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "Acesso negado: servidor proxy proíbe túneis no porto %d."
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de ligação de proxy %d"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8698,71 +9922,71 @@
 #. * Custom away message.
 #: src/prpl.h:195
 msgid "Custom"
-msgstr "Personalizar"
+msgstr "Personalizado"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "Favor digitar sua senha"
 
-#: src/server.c:962
+#: src/server.c:917
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d mensagem)"
 msgstr[1] "(%d mensagens)"
 
-#: src/server.c:976
+#: src/server.c:931
 msgid "(1 message)"
 msgstr "(1 mensagem)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1111 src/server.c:1121
 #, c-format
 msgid "%s logged in."
 msgstr "%s ligou-se."
 
-#: src/server.c:1184
+#: src/server.c:1134
 #, c-format
 msgid "%s signed on"
 msgstr "%s ligou-se"
 
-#: src/server.c:1200
+#: src/server.c:1150
 #, c-format
 msgid "%s came back"
 msgstr "%s voltou"
 
-#: src/server.c:1202
+#: src/server.c:1152
 #, c-format
 msgid "%s went away"
 msgstr "%s foi-se embora"
 
-#: src/server.c:1217
+#: src/server.c:1167
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inactivo"
 
-#: src/server.c:1231
+#: src/server.c:1181
 #, c-format
 msgid "%s became unidle"
 msgstr "%s tornou-se activo"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1192 src/server.c:1200
 #, c-format
 msgid "%s logged out."
 msgstr "%s desligou-se."
 
-#: src/server.c:1267
+#: src/server.c:1214
 #, c-format
 msgid "%s signed off"
 msgstr "%s desligou-se"
 
-#: src/server.c:1317
+#: src/server.c:1264
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8771,11 +9995,11 @@
 "%s foi alertado por %s.\n"
 "O seu novo nível de alerta é %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1267
 msgid "an anonymous person"
 msgstr "uma pessoa anónima"
 
-#: src/server.c:1430
+#: src/server.c:1377
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8784,12 +10008,12 @@
 "Utilizador '%s' convida %s para sala de chat de contacto: '%s'\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1381
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Utilizador '%s' convida %s para sala de chat de contacto: '%s'\n"
 
-#: src/server.c:1440
+#: src/server.c:1387
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para chat?"
 
@@ -8798,11 +10022,11 @@
 #. * makes it slightly less boring ;)
 #: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
-msgstr "Desculpe, saí por um pouco. Volto depois!"
+msgstr "Lamento, saí por um bocado!"
 
 #: src/stock.c:86
 msgid "_Alias"
-msgstr "_Nome"
+msgstr "_Nomear"
 
 #: src/stock.c:88
 msgid "_Modify"
@@ -8816,33 +10040,33 @@
 msgid "_Warn"
 msgstr "_Alertar"
 
-#: src/util.c:2040
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: src/util.c:2043
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:2430
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro ao abrir ligação.\n"
 
@@ -8858,6 +10082,194 @@
 msgid "Notification"
 msgstr "Notificação"
 
+#~ msgid "Full Name:\t\t%s\n"
+#~ msgstr "Nome Completo:\t\t%s\n"
+
+#~ msgid "First Name:\t%s\n"
+#~ msgstr "Primeiro Nome:\t%s\n"
+
+#~ msgid "Middle Names:\t%s\n"
+#~ msgstr "Nomes do Meio:\t%s\n"
+
+#~ msgid "Family Name:\t%s\n"
+#~ msgstr "Apelido:\t%s\n"
+
+#~ msgid "Nickname:\t\t%s\n"
+#~ msgstr "Nome Remoto:\t\t%s\n"
+
+#~ msgid "Birth Day:\t\t%s\n"
+#~ msgstr "Data de Nascimento:\t\t%s\n"
+
+#~ msgid "Unit:\t\t%s\n"
+#~ msgstr "Unidade:\t\t%s\n"
+
+#~ msgid "Homepage:\t%s\n"
+#~ msgstr "Página da Web:\t%s\n"
+
+#~ msgid "Address:\t%s\n"
+#~ msgstr "Endereço:\t%s\n"
+
+#~ msgid "Tel:\t\t\t%s\n"
+#~ msgstr "Tel:\t\t\t%s\n"
+
+#~ msgid "EMail:\t\t%s\n"
+#~ msgstr "EMail:\t\t%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Note:\t\t%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nota:\t\t%s\n"
+
+#~ msgid "Real Name:\t%s\n"
+#~ msgstr "Nome Real:\t%s\n"
+
+#~ msgid "Username:\t\t%s\n"
+#~ msgstr "Nome de Utilizador:\t\t%s\n"
+
+#~ msgid "Server:\t\t%s\n"
+#~ msgstr "Servidor:\t\t%s\n"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Ligação perdida"
+
+#~ msgid "ZLocate"
+#~ msgstr "ZLocate"
+
+#~ msgid "Set"
+#~ msgstr "Definir"
+
+#~ msgid "idle for"
+#~ msgstr "inactivo por"
+
+#~ msgid "Buddy List Toolbar"
+#~ msgstr "Barra de ferramentas da lista de contactos"
+
+#~ msgid "Group Display"
+#~ msgstr "Exibição de grupos"
+
+#~ msgid "Show _numbers in groups"
+#~ msgstr "Mostrar _números em grupos"
+
+#~ msgid "Show status _icons on tabs"
+#~ msgstr "Mostrar os í_cones de estado nas abas."
+
+#~ msgid "New window _width:"
+#~ msgstr "_Largura das novas janelas:"
+
+#~ msgid "New window _height:"
+#~ msgstr "_Altura das novas janelas:"
+
+#~ msgid "_Entry field height:"
+#~ msgstr "_Altura do campo de entrada:"
+
+#~ msgid "Tab Completion"
+#~ msgstr "Completar com TAB"
+
+#~ msgid "_Tab-complete nicks"
+#~ msgstr "_Completar nomes com TAB"
+
+#~ msgid "_Old-style tab completion"
+#~ msgstr "Completar nomes da maneira _antiga"
+
+#~ msgid "_Show people joining in window"
+#~ msgstr "_Mostrar na janela pessoas que entram"
+
+#~ msgid "_Show people leaving in window"
+#~ msgstr "M_ostrar na janela pessoas que saiem"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "Ficheiro de registo i_ndividual para cada ligação de contacto"
+
+#~ msgid "Sounds when you _log in"
+#~ msgstr "Sons quando se _liga"
+
+#~ msgid "_Sending messages removes away status"
+#~ msgstr "_Enviar mensagens remove o estado de ausente"
+
+#~ msgid "Seconds before _resending:"
+#~ msgstr "Segundos antes de _re-enviar:"
+
+#~ msgid "Send auto-response in _active conversations"
+#~ msgstr "Enviar auto-resposta em _conversas activas"
+
+#~ msgid "Fonts"
+#~ msgstr "Fontes"
+
+#~ msgid ""
+#~ "You are not currently signed on with any protocols that have the ability "
+#~ "to list rooms."
+#~ msgstr ""
+#~ "De momento não está ligado a nenhum protocolo que possua o recurso de "
+#~ "listar salas."
+
+#~ msgid "Hide window on _send"
+#~ msgstr "Ocultar janela ao _enviar"
+
+#~ msgid "<b>Screen Name:</b>"
+#~ msgstr "<b>Nome de Utilizador:</b>"
+
+#~ msgid "Sign on"
+#~ msgstr "Ligar"
+
+#~ msgid "/Tools/P_rotocol Actions"
+#~ msgstr "/Ferramentas/Acções de P_rotocolo"
+
+#~ msgid "/Tools/Protocol Actions"
+#~ msgstr "/Ferramentas/Ações de Protocolo"
+
+#~ msgid "Style"
+#~ msgstr "Estilo"
+
+#~ msgid "_Bold"
+#~ msgstr "_Negrito"
+
+#~ msgid "_Italic"
+#~ msgstr "_Itálico"
+
+#~ msgid "_Underline"
+#~ msgstr "_Sublinhado"
+
+#~ msgid "_Strikethrough"
+#~ msgstr "_Riscado"
+
+#~ msgid "Face"
+#~ msgstr "Fonte"
+
+#~ msgid "Use custo_m face"
+#~ msgstr "Usar _letra personalizada"
+
+#~ msgid "Use custom si_ze"
+#~ msgstr "Usar _tamanho personalizado"
+
+#~ msgid "Color"
+#~ msgstr "Cor"
+
+#~ msgid "_Text color"
+#~ msgstr "_Cor do texto"
+
+#~ msgid "Bac_kground color"
+#~ msgstr "Cor de _fundo"
+
+#~ msgid "Show graphical _smileys"
+#~ msgstr "Mostrar _smileys gráficos"
+
+#~ msgid "Show _URLs as links"
+#~ msgstr "Mostrar _URLs como elos"
+
+#~ msgid "Send _URLs as links"
+#~ msgstr "Enviar _URLs como elos"
+
+#~ msgid "Show _logins in window"
+#~ msgstr "Mostrar _entradas de utilizadores na janela"
+
+#~ msgid "Unable to send password"
+#~ msgstr "Impossível enviar senha"
+
+#~ msgid "IO Error."
+#~ msgstr "Erro de E/S."
+
 #~ msgid "Username: <b>%s</b><br>\n"
 #~ msgstr "Nome de Utilizador: <b>%s</b><br>\n"
 
@@ -8885,6 +10297,9 @@
 #~ msgid "Invalid User"
 #~ msgstr "Utilizador inválido"
 
+#~ msgid "<b>Status:</b> "
+#~ msgstr "<b>Estado:</b> "
+
 #~ msgid "<b>IP Address:</b> "
 #~ msgstr "<b>Morada de IP:</b>"
 
@@ -8894,5 +10309,8 @@
 #~ msgid "<b>Available:</b> "
 #~ msgstr "<b>Disponível:</b> "
 
+#~ msgid "<b>Away Message:</b> "
+#~ msgstr "<b>Mensagens de Ausência:</b> "
+
 #~ msgid "<b>Status:</b> Not Authorized"
 #~ msgstr "<b>Estado:</b> Não autorizado"
--- a/po/zh_CN.po	Tue May 25 03:54:12 2004 +0000
+++ b/po/zh_CN.po	Tue May 25 04:28:54 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-22 00:01-0400\n"
-"PO-Revision-Date: 2004-05-22 14:49+0800\n"
+"POT-Creation-Date: 2004-05-24 21:09-0400\n"
+"PO-Revision-Date: 2004-05-25 10:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -158,21 +158,21 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1591 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2884
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5406
-#: src/protocols/oscar/oscar.c:6388 src/protocols/oscar/oscar.c:6587
-#: src/protocols/silc/buddy.c:1360 src/protocols/silc/silc.c:46
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "离开"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5324 src/protocols/oscar/oscar.c:6595
+#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
 msgid "Back"
 msgstr "回来"
 
@@ -180,7 +180,7 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "文件传送"
 
@@ -188,7 +188,7 @@
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2542
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "首选项"
 
@@ -403,15 +403,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:3004 src/gtkprefs.c:864 src/gtkprefs.c:1010
-#: src/gtkprefs.c:1052 src/gtkprefs.c:1604 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
+#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1951
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
 #: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1365 src/protocols/trepia/trepia.c:398
+#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -426,13 +426,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6860
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4029
-#: src/gtkblist.c:4358
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "组:"
 
@@ -468,27 +468,27 @@
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3853
+#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:380 plugins/idle.c:52 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "账户"
 
@@ -499,7 +499,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -507,7 +507,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
@@ -583,27 +583,27 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:56
+#: plugins/idle.c:55
 msgid "Minutes"
 msgstr "分钟"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:62 plugins/idle.c:95
 msgid "I'dle Mak'er"
 msgstr "瞌睡虫"
 
-#: plugins/idle.c:64 plugins/idle.c:80
+#: plugins/idle.c:63 plugins/idle.c:78
 msgid "Set Account Idle Time"
 msgstr "设定账户瞌睡时间"
 
-#: plugins/idle.c:67
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:68 src/dialogs.c:907
+#: plugins/idle.c:67 src/dialogs.c:793
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: plugins/idle.c:100 plugins/idle.c:101
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
@@ -845,7 +845,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:505
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -853,7 +853,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:508 plugins/signals-test.c:510
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1088,7 +1088,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:858
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -1140,8 +1140,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3045
-#: src/gtkprefs.c:2449
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1160,8 +1160,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:911
-#: src/gtkprefs.c:2450 src/protocols/msn/msn.c:1607
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
 msgstr "对话"
 
@@ -1177,16 +1177,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1196,211 +1196,211 @@
 "Jabber,Napster,Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写成,并以 GPL 许可协议发"
 "行。<BR><BR>"
 
-#: src/about.c:104
+#: src/about.c:105
 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>"
 
-#: src/about.c:109
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/about.c:110
+#: src/about.c:111
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/about.c:115
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121 src/about.c:122
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "开发者"
 
-#: src/about.c:123
+#: src/about.c:124
 msgid "support"
 msgstr "支持"
 
-#: src/about.c:130
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:155
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:163
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:164 src/about.c:201
+#: src/about.c:165 src/about.c:202
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:165 src/about.c:202
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/about.c:169 src/about.c:203
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:171 src/about.c:205
+#: src/about.c:172 src/about.c:206
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:172 src/about.c:206
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:173
+#: src/about.c:174
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:176 src/about.c:207
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:177 src/about.c:209
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:178
-msgid "Dutch; Flemish"
-msgstr "荷兰语"
-
 #: src/about.c:179
-msgid "Macedonian"
-msgstr "马其顿语"
+msgid "Dutch; Flemish"
+msgstr "荷兰语"
 
 #: src/about.c:180
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:181 src/about.c:210
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:185 src/about.c:211
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:187
+#: src/about.c:188
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/about.c:188 src/about.c:213
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:190
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/about.c:191
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:198
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:199
-msgid "Amharic"
-msgstr "阿姆哈拉语"
-
 #: src/about.c:200
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:212
+#: src/about.c:213
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:214
+#: src/about.c:215
 msgid "Chinese"
 msgstr "中文"
 
@@ -1436,45 +1436,45 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
-#: src/dialogs.c:581 src/gtkblist.c:2391 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:191 src/protocols/msn/msn.c:202
-#: src/protocols/msn/msn.c:213 src/protocols/msn/msn.c:224
-#: src/protocols/oscar/oscar.c:3310 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:6648 src/protocols/oscar/oscar.c:6744
-#: src/protocols/oscar/oscar.c:6793 src/protocols/oscar/oscar.c:6877
-#: src/protocols/silc/buddy.c:447 src/protocols/silc/buddy.c:1087
-#: src/protocols/silc/chat.c:657 src/protocols/silc/ops.c:978
-#: src/protocols/silc/ops.c:1389 src/protocols/silc/silc.c:687
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
+#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
+#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
+#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
+#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
 #: src/request.h:1242
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
-#: src/dialogs.c:306 src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352
-#: src/dialogs.c:473 src/dialogs.c:529 src/dialogs.c:582 src/dialogs.c:929
-#: src/dialogs.c:946 src/dialogs.c:965 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2392 src/gtkblist.c:4397
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:588
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
+#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
 #: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
-#: src/protocols/oscar/oscar.c:1360 src/protocols/oscar/oscar.c:3270
-#: src/protocols/oscar/oscar.c:3311 src/protocols/oscar/oscar.c:3347
-#: src/protocols/oscar/oscar.c:3392 src/protocols/oscar/oscar.c:6649
-#: src/protocols/oscar/oscar.c:6745 src/protocols/oscar/oscar.c:6794
-#: src/protocols/oscar/oscar.c:6861 src/protocols/oscar/oscar.c:6878
-#: src/protocols/silc/buddy.c:448 src/protocols/silc/buddy.c:992
-#: src/protocols/silc/buddy.c:1088 src/protocols/silc/chat.c:658
-#: src/protocols/silc/ops.c:1390 src/protocols/silc/silc.c:688
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2513 src/request.h:1242 src/request.h:1252
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
+#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
+#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
@@ -1483,7 +1483,7 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:513
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
@@ -1506,7 +1506,7 @@
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1160 src/gtkconv.c:3337 src/gtkconv.c:3436
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "删除"
@@ -1519,7 +1519,7 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:590 src/gtkprefs.c:2452
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "聊天"
 
@@ -1539,8 +1539,8 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:732
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2727
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "未知"
 
@@ -1559,20 +1559,20 @@
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
@@ -1629,7 +1629,7 @@
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2489 src/gtkprefs.c:1384
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "新建窗口"
 
@@ -1645,11 +1645,11 @@
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:174
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1661,47 +1661,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:183
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:190
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:302
+#: src/dialogs.c:301
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:304 src/dialogs.c:305
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:313
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:329 src/dialogs.c:330
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:346
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1710,116 +1710,104 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:350 src/dialogs.c:351
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:454 src/dialogs.c:510 src/dialogs.c:562
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/dialogs.c:460 src/dialogs.c:516 src/dialogs.c:568
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:466
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:468
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/dialogs.c:523
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:524
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/dialogs.c:576
+#: src/dialogs.c:575
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/dialogs.c:578
+#: src/dialogs.c:577
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名。"
 
-#: src/dialogs.c:606 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "选择文字颜色"
-
-#: src/dialogs.c:634 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "选择背景颜色"
-
-#: src/dialogs.c:673 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "选择字体"
-
-#: src/dialogs.c:746
+#: src/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:748
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:758
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:841
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:895
+#: src/dialogs.c:781
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/dialogs.c:899
+#: src/dialogs.c:785
 msgid "Sa_ve & Use"
 msgstr "保存并使用(_V)"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:789
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/dialogs.c:925
+#: src/dialogs.c:811
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:926
+#: src/dialogs.c:812
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:928 src/dialogs.c:945 src/dialogs.c:964 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:545
+#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:942
+#: src/dialogs.c:828
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:943
+#: src/dialogs.c:829
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:960
+#: src/dialogs.c:846
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "好友别名"
 
@@ -1929,19 +1917,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "对不起,我临时有事离开一会儿。麻烦您稍后再联络我。"
 
-#: src/gaimrc.c:374 src/gaimrc.c:1401
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "临时有事"
 
-#: src/gaimrc.c:1211 src/gtkblist.c:3006
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gaimrc.c:1213 src/gtkblist.c:3007
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1215 src/gtkblist.c:3008
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1965,7 +1953,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:4001
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1973,7 +1961,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:4015 src/gtkblist.c:4344
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "别名:"
 
@@ -2034,7 +2022,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1185
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -2050,15 +2038,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1179
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1209
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1227
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -2066,7 +2054,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1264
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -2101,15 +2089,15 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3922
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
 msgid "Screen Name"
 msgstr "用户名"
 
 #: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5404
-#: src/protocols/oscar/oscar.c:6586 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1183
-#: src/protocols/zephyr/zephyr.c:1193
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "在线"
 
@@ -2141,214 +2129,214 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4396 src/gtkconv.c:1162
-#: src/gtkconv.c:3330 src/gtkconv.c:3429 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3554
+#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
+#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:832
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:843 src/gtkpounce.c:431 src/gtkroomlist.c:352
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1082 src/gtkblist.c:3198
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1085 src/gtkblist.c:3189
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1087
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1089
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1153 src/gtkblist.c:1282 src/gtkblist.c:1296
+#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1284 src/gtkblist.c:1301
+#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1260 src/gtkroomlist.c:261 src/gtkroomlist.c:404
+#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1262
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1298 src/gtkblist.c:1324
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1329
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1987 src/gtkconv.c:3950 src/gtkpounce.c:333
+#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2296
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2350
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2311
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2312
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2357,7 +2345,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2435
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2365,12 +2353,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2378,7 +2366,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2386,7 +2374,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2394,7 +2382,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2402,7 +2390,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2410,7 +2398,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2418,7 +2406,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2426,7 +2414,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2434,7 +2422,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2442,7 +2430,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2450,96 +2438,96 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2793
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2795
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2875
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2878
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:2927
+#: src/gtkblist.c:2881
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3072
+#: src/gtkblist.c:3026
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3075
+#: src/gtkblist.c:3029
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3078
+#: src/gtkblist.c:3032
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3081
+#: src/gtkblist.c:3035
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3171
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3195
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3204
+#: src/gtkblist.c:3158
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3207
+#: src/gtkblist.c:3161
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3212
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3215
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3220
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3955 src/protocols/silc/buddy.c:686
-#: src/protocols/silc/buddy.c:944 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/buddy.c:1079 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
+#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
+#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3979
+#: src/gtkblist.c:3933
 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. "
@@ -2549,35 +2537,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4039 src/gtkblist.c:4324
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4283
+#: src/gtkblist.c:4237
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4290
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4314
+#: src/gtkblist.c:4268
 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:4393
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4394
+#: src/gtkblist.c:4348
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4947 src/gtkblist.c:5073
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2635,311 +2623,311 @@
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:539
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:567
+#: src/gtkconv.c:582
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:588
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:608
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:716 src/gtkdebug.c:127
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:742 src/gtkdebug.c:155
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1120
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1128
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1130
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1139 src/gtkconv.c:3344
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1148
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2240
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2245
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2251
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2618
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2626
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2729
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3106
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3152
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3143
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3154
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3161
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3172
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3174
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3217
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3222
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3232
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3246
+#: src/gtkconv.c:3263
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3250
+#: src/gtkconv.c:3267
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3254
+#: src/gtkconv.c:3271
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3260
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3264
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3270
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3300 src/gtkconv.c:3302 src/gtkconv.c:3408 src/gtkconv.c:3410
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3316
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3319
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3323 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3340
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3347 src/gtkconv.c:3691
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3422
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3425
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3432
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3439
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3613
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3668
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3680
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4241
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4764 src/gtkconv.c:4796 src/gtkconv.c:4917 src/gtkconv.c:4984
+#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5515 src/gtkconv.c:5518
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2959,134 +2947,138 @@
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "已取消"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "正在传送开始"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "已取消"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1131 src/protocols/silc/buddy.c:978
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
 msgid "Open..."
 msgstr "打开..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "另存为..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3101,118 +3093,142 @@
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1200
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "超级链接颜色"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "绘制超级链接的颜色。"
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1212
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1222
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2659
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2668
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2691
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "选择字体"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "选择文字颜色"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "选择背景颜色"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "插入链接"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "请输入您想要插入链接的 URL。"
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "插入链接"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:457
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:483
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:618
+#: src/gtkimhtmltoolbar.c:638
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:633
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:851
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:862
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:873
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:889
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:901
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:930
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:942
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:957
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:978
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3221,7 +3237,7 @@
 msgstr "交谈对象"
 
 #. Window **********
-#: src/gtklog.c:369 src/gtklog.c:385
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3264,22 +3280,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:420
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: src/gtknotify.c:423 src/gtknotify.c:437 src/gtknotify.c:452
-#: src/gtknotify.c:560
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:434 src/gtknotify.c:449
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错: %s"
 
-#: src/gtknotify.c:561
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
@@ -3432,315 +3448,342 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:409
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:411
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:635
+#: src/gtkprefs.c:632
 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:675
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:682 src/gtkprefs.c:1988 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:750 src/gtkprefs.c:1060
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:751
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:754
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:757
-msgid "Ignore formatting on incoming messages"
-msgstr "忽略收到信息的格式"
-
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:784
+msgid "Ignore c_olors"
+msgstr "忽略颜色(_O)"
+
+#: src/gtkprefs.c:786
+msgid "Ignore font _faces"
+msgstr "忽略字体(_F)"
+
+#: src/gtkprefs.c:788
+msgid "Ignore font si_zes"
+msgstr "较大字体(_Z)"
+
+#: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "忽略收到信息的格式(_I)"
+
+#: src/gtkprefs.c:795
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "送出信息使用默认格式(_S)"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"当您使用的协议支持格式时,您送出的信息将会显示为这样。"
+
+#: src/gtkprefs.c:832
+msgid "_Clear Formatting"
+msgstr "清除格式(_C)"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:816
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:875
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:826
+#: src/gtkprefs.c:880
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} 更改格式(_F)"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:844
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:859 src/gtkprefs.c:1005 src/gtkprefs.c:1047
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:861 src/gtkprefs.c:1007 src/gtkprefs.c:1049
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:862 src/gtkprefs.c:1008 src/gtkprefs.c:1050
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:863 src/gtkprefs.c:1009 src/gtkprefs.c:1051
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:866 src/gtkprefs.c:1016 src/gtkprefs.c:1058
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:870 src/gtkprefs.c:1020
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:976
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
-#: src/gtkprefs.c:931
+#: src/gtkprefs.c:985
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:988
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:993
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:1006
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:965
+#: src/gtkprefs.c:1019
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:1021
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:1022
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:1023
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:1024
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:1003 src/gtkprefs.c:1045
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1073
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:1080
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1061
+#: src/gtkprefs.c:1115
 msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1082 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4777
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4811
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1138
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1093
+#: src/gtkprefs.c:1147
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1171
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1130
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1178
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1181
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1188
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1246
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3749,79 +3792,79 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1493
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1496
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1498
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1501
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1503
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1506
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1512
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1517
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1526
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1528
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1535
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1545
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3830,61 +3873,61 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1595
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1598
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2721 src/protocols/oscar/oscar.c:3935
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1602
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1618
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1706
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3899,7 +3942,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1711
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3914,104 +3957,104 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1944
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1958
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2006
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2133
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2240
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2247
+#: src/gtkprefs.c:2301
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2409
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2445
+#: src/gtkprefs.c:2499
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2446
+#: src/gtkprefs.c:2500
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2447
+#: src/gtkprefs.c:2501
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2448
+#: src/gtkprefs.c:2502
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2451
+#: src/gtkprefs.c:2505
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2453
+#: src/gtkprefs.c:2507
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2454
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2457
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2459
+#: src/gtkprefs.c:2513
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2460
+#: src/gtkprefs.c:2514
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2461
+#: src/gtkprefs.c:2515
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2462
+#: src/gtkprefs.c:2516
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2463
+#: src/gtkprefs.c:2517
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2466
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "协议"
 
-#: src/gtkprefs.c:2467
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "插件"
 
@@ -4035,7 +4078,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1277
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4099,14 +4142,14 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1837 src/protocols/silc/buddy.c:303
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1838 src/protocols/silc/buddy.c:304
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
@@ -4115,7 +4158,7 @@
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
 #: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "关闭"
@@ -4328,12 +4371,12 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:378 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2712
-#: src/protocols/novell/novell.c:2831 src/protocols/novell/novell.c:2882
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2771
 msgid "Available"
 msgstr "可用"
 
@@ -4347,10 +4390,10 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5319 src/protocols/oscar/oscar.c:5397
-#: src/protocols/oscar/oscar.c:5421 src/protocols/oscar/oscar.c:6592
-#: src/protocols/oscar/oscar.c:6597 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4366,7 +4409,7 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1659
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
@@ -4393,173 +4436,174 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:399
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:414
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:593 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:518
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
+#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
+#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
+#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:609
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "正在读取数据"
 
-#: src/protocols/gg/gg.c:612
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:615
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "正在读取服务器密钥"
 
-#: src/protocols/gg/gg.c:618
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:628
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:646 src/protocols/gg/gg.c:737
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:706
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:711
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:769
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:857
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4769
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4780 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4781 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1628
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4770
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:882 src/protocols/gg/gg.c:885
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:893
-#: src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4824 src/protocols/oscar/oscar.c:4832
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1301
-#: src/protocols/msn/msn.c:1545 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3747 src/protocols/oscar/oscar.c:3963
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:568
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
+#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/protocols/gg/gg.c:940
+#: src/protocols/gg/gg.c:950
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:948
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1011
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1019
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1027
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1035
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1044
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1051
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1170
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1171
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4567,76 +4611,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1201
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1274
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1275 src/protocols/gg/gg.c:1298
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1297
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1348
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1349
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1383
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1384
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1401
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1410 src/protocols/jabber/jabber.c:1060
-#: src/protocols/toc/toc.c:1553
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
+#: src/protocols/toc/toc.c:1558
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1418
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1424
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1430
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1464
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1465
+#: src/protocols/gg/gg.c:1461
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4654,7 +4699,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1607 src/protocols/gg/gg.c:1609
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4669,15 +4714,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
 #: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3482
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
 #: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3484
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:6060
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4739,70 +4784,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 无法打开监听端口。"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6693
-#: src/protocols/yahoo/yahoo.c:2456
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/irc/irc.c:168 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:1576
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:372 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:506 src/protocols/silc/chat.c:1264
+#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
 #: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:509 src/protocols/silc/chat.c:1267
-#: src/protocols/silc/ops.c:1001 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "话题"
 
@@ -4815,32 +4861,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:632 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1386 src/protocols/napster/napster.c:657
+#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:635 src/protocols/jabber/jabber.c:1407
-#: src/protocols/msn/msn.c:1726 src/protocols/napster/napster.c:662
-#: src/protocols/silc/silc.c:1045 src/protocols/trepia/trepia.c:1306
+#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:638 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:641 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "用户名"
 
@@ -4865,7 +4913,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo.c:3058
 msgid "Realname"
 msgstr "真名"
 
@@ -4986,7 +5035,7 @@
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:862
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
@@ -5014,9 +5063,9 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1413
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
+#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
 msgid "Disconnected."
 msgstr "已断开连接。"
 
@@ -5047,20 +5096,24 @@
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:606 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "昵称"
 
@@ -5068,134 +5121,140 @@
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
 #: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:632
-#: src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4805
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4839
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2734
-#: src/protocols/novell/novell.c:2738 src/protocols/oscar/oscar.c:574
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4823 src/protocols/oscar/oscar.c:4831
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:961
 msgid "Unsubscribe"
 msgstr "退订"
 
@@ -5291,7 +5350,7 @@
 msgstr "初始化会话出错"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
@@ -5331,7 +5390,7 @@
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "未知错误"
 
@@ -5343,7 +5402,7 @@
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "密码"
 
@@ -5352,13 +5411,14 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:4833 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
+#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:641 src/protocols/silc/silc.c:634
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "电话"
 
@@ -5376,9 +5436,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:2097 src/protocols/oscar/oscar.c:1580
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
+#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
 #: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "正在连接"
@@ -5395,9 +5455,9 @@
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6396
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -5441,8 +5501,8 @@
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5409
-#: src/protocols/oscar/oscar.c:6588
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6622
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -5458,219 +5518,219 @@
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1041 src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1539
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
 msgid "Set User Info"
 msgstr "设置用户信息"
 
+#: src/protocols/jabber/jabber.c:1136
+msgid "Bad Request"
+msgstr "无效请求"
+
 #: src/protocols/jabber/jabber.c:1138
-msgid "Bad Request"
-msgstr "无效请求"
+msgid "Conflict"
+msgstr "冲突"
 
 #: src/protocols/jabber/jabber.c:1140
-msgid "Conflict"
-msgstr "冲突"
+msgid "Feature Not Implemented"
+msgstr "特性未实现"
 
 #: src/protocols/jabber/jabber.c:1142
-msgid "Feature Not Implemented"
-msgstr "特性未实现"
+msgid "Forbidden"
+msgstr "禁止"
 
 #: src/protocols/jabber/jabber.c:1144
-msgid "Forbidden"
-msgstr "禁止"
-
-#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "不允许"
 
+#: src/protocols/jabber/jabber.c:1158
+msgid "Payment Required"
+msgstr "需要付费"
+
 #: src/protocols/jabber/jabber.c:1160
-msgid "Payment Required"
-msgstr "需要付费"
-
-#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
+#: src/protocols/jabber/jabber.c:1164
+msgid "Registration Required"
+msgstr "需要注册"
+
 #: src/protocols/jabber/jabber.c:1166
-msgid "Registration Required"
-msgstr "需要注册"
-
-#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1170
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
+#: src/protocols/jabber/jabber.c:1174
+msgid "Subscription Required"
+msgstr "需要订阅"
+
 #: src/protocols/jabber/jabber.c:1176
-msgid "Subscription Required"
-msgstr "需要订阅"
-
-#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
+#: src/protocols/jabber/jabber.c:1183
+msgid "Authorization Aborted"
+msgstr "认证被中断"
+
 #: src/protocols/jabber/jabber.c:1185
-msgid "Authorization Aborted"
-msgstr "认证被中断"
-
-#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
+#: src/protocols/jabber/jabber.c:1199
+msgid "Temporary Authentication Failure"
+msgstr "临时认证失败"
+
 #: src/protocols/jabber/jabber.c:1201
-msgid "Temporary Authentication Failure"
-msgstr "临时认证失败"
-
-#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1205
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
+msgid "Connection Timeout"
+msgstr "连接超时"
+
 #: src/protocols/jabber/jabber.c:1214
-msgid "Connection Timeout"
-msgstr "连接超时"
+msgid "Host Gone"
+msgstr "主机宕机"
 
 #: src/protocols/jabber/jabber.c:1216
-msgid "Host Gone"
-msgstr "主机宕机"
-
-#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
+#: src/protocols/jabber/jabber.c:1232
+msgid "Policy Violation"
+msgstr "违背策略"
+
 #: src/protocols/jabber/jabber.c:1234
-msgid "Policy Violation"
-msgstr "违背策略"
+msgid "Remote Connection Failed"
+msgstr "远程连接失败"
 
 #: src/protocols/jabber/jabber.c:1236
-msgid "Remote Connection Failed"
-msgstr "远程连接失败"
+msgid "Resource Constraint"
+msgstr "资源约束"
 
 #: src/protocols/jabber/jabber.c:1238
-msgid "Resource Constraint"
-msgstr "资源约束"
-
-#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
+#: src/protocols/jabber/jabber.c:1246
+msgid "Unsupported Encoding"
+msgstr "不支持的编码"
+
 #: src/protocols/jabber/jabber.c:1248
-msgid "Unsupported Encoding"
-msgstr "不支持的编码"
+msgid "Unsupported Stanza Type"
+msgstr "不支持的节类型"
 
 #: src/protocols/jabber/jabber.c:1250
-msgid "Unsupported Stanza Type"
-msgstr "不支持的节类型"
+msgid "Unsupported Version"
+msgstr "不支持的版本"
 
 #: src/protocols/jabber/jabber.c:1252
-msgid "Unsupported Version"
-msgstr "不支持的版本"
-
-#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -5685,24 +5745,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1364 src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1392
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1397
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1402
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1411 src/protocols/silc/silc.c:1041
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -5776,12 +5836,12 @@
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
@@ -6026,8 +6086,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1989
-#: src/protocols/silc/ops.c:1198 src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6061,35 +6121,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:79
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:187
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:188
+#: src/protocols/msn/msn.c:190
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:200
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:232
+#: src/protocols/msn/msn.c:238
 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?"
@@ -6097,92 +6157,92 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:672
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:674
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:676
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2833 src/protocols/novell/novell.c:2887
-#: src/protocols/silc/buddy.c:1364 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:678
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:680
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:682
-#: src/protocols/zephyr/zephyr.c:1180 src/protocols/zephyr/zephyr.c:1195
+#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:397
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:406
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:442
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:452
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:476
+#: src/protocols/msn/msn.c:482
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6190,7 +6250,7 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:799
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6199,11 +6259,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:840
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:836
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6212,81 +6272,81 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1372 src/protocols/oscar/oscar.c:4810
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3066
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1379 src/protocols/oscar/oscar.c:4796
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1394 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1402 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1419 src/protocols/msn/msn.c:1425
-#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1439
-#: src/protocols/msn/msn.c:1446
+#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
+#: src/protocols/msn/msn.c:1452
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1468
-#: src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1490
-#: src/protocols/msn/msn.c:1497
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1506 src/protocols/msn/msn.c:1512
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
+#: src/protocols/yahoo/yahoo.c:3113
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1520 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1531 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/msn/msn.c:1612
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1617
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6301,15 +6361,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1721 src/protocols/trepia/trepia.c:1301
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6334,7 +6394,7 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
-#: src/protocols/oscar/oscar.c:2278
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6434,54 +6494,50 @@
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr "无法从服务器读取信息。命令为 %hd,长度为 %hd。"
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:243
+#, 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:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/silc/chat.c:741
-msgid "Get Info"
-msgstr "信息"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:6096
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1274
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6496,10 +6552,136 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:637 src/protocols/napster/napster.c:639
+#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "请求的参数未传入"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "无法写入网络"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "无法从网络读取套接字"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "与服务器通讯出错"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "会议未找到"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "会议不存在"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "已存在同名文件夹"
+
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "支持"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "密码已过期"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "无效的密码"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "用户未找到"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "账户已经被禁用"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "服务器无法访问目录"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "您的系统管理员已经禁用此操作"
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "服务器不可用;请稍候再试"
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "无法为同一个文件夹添加两次联系人"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "无法添加您自己"
+
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "主存档配置错误"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "无效的用户名或密码"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "无法识别您输入用户名的主机"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+"您的账户已经被禁用,原因是输错密码的次数太多"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "您无法将同一个人两次添加到对话"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "您达到了所允许联系人的最大数目"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "您输入了无效的用户名"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "更新目录时发生了错误"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "不兼容的协议版本"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "用户已经屏蔽了您"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "试用版本不允许超过十个用户同时在线"
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "用户或者离线,或者已经屏蔽了您"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "未知错误:0x%X"
+
 #: src/protocols/novell/novell.c:119
 #, c-format
 msgid "Login failed (%s)."
@@ -6575,7 +6757,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1568
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
@@ -6585,7 +6767,7 @@
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1607
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
@@ -6608,38 +6790,38 @@
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1558
+#: src/protocols/novell/novell.c:1566
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1621
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1647
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1662
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1795
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1822
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1823
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6650,15 +6832,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1825
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1930
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:1984
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6668,34 +6850,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2082
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2104
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2413
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2724 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6398 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2735
+#: src/protocols/novell/novell.c:2743
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2890
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3283
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -6710,15 +6892,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3355 src/protocols/novell/novell.c:3357
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3376
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3380
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
 msgstr "服务器端口"
 
@@ -6826,11 +7008,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/silc.c:630
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
 msgid "Get File"
 msgstr "获取文件"
 
@@ -6902,18 +7085,18 @@
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5418
-#: src/protocols/oscar/oscar.c:6591
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6625
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5412
-#: src/protocols/oscar/oscar.c:6589
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:6623
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5415
-#: src/protocols/oscar/oscar.c:6590
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:6624
 msgid "Occupied"
 msgstr "琐事缠身"
 
@@ -6962,36 +7145,36 @@
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1362
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1355
+#: src/protocols/oscar/oscar.c:1366
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1359 src/protocols/oscar/oscar.c:3269
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1425 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1441
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1522
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1536
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7001,45 +7184,45 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1564
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1665 src/protocols/oscar/oscar.c:2082
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1673
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1786 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1791
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1862
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1966 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1971
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1975
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1980
+#: src/protocols/oscar/oscar.c:2001
 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."
@@ -7047,21 +7230,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1985
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2089
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2125 src/protocols/oscar/oscar.c:2155
-#: src/protocols/oscar/oscar.c:2243
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7069,24 +7252,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2128 src/protocols/oscar/oscar.c:2158
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2246
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3062 src/protocols/oscar/oscar.c:3084
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:3261
+#: src/protocols/oscar/oscar.c:3282
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3264
+#: src/protocols/oscar/oscar.c:3285
 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 "
@@ -7095,42 +7278,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3300
+#: src/protocols/oscar/oscar.c:3321
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3308
+#: src/protocols/oscar/oscar.c:3329
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3309
+#: src/protocols/oscar/oscar.c:3330
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3338
+#: src/protocols/oscar/oscar.c:3360
 #, 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:3343 src/protocols/oscar/oscar.c:3345
+#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3381 src/protocols/oscar/oscar.c:3383
-#: src/protocols/oscar/oscar.c:3390 src/protocols/oscar/oscar.c:3472
-#: src/protocols/oscar/oscar.c:3492 src/protocols/oscar/oscar.c:3843
-#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:6017
-#: src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
+#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6097
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3423
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3472
+#: src/protocols/oscar/oscar.c:3506
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7139,11 +7322,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3480 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3492
+#: src/protocols/oscar/oscar.c:3526
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7153,17 +7336,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3493
+#: src/protocols/oscar/oscar.c:3527
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3500
+#: src/protocols/oscar/oscar.c:3534
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3508
+#: src/protocols/oscar/oscar.c:3542
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7176,7 +7359,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:3550
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7189,7 +7372,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3524
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7202,32 +7385,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3585
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3589
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:3674
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:3649
+#: src/protocols/oscar/oscar.c:3683
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3692
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7235,77 +7418,77 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3667
+#: src/protocols/oscar/oscar.c:3701
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:3676
+#: src/protocols/oscar/oscar.c:3710
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:3685
+#: src/protocols/oscar/oscar.c:3719
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3746
+#: src/protocols/oscar/oscar.c:3780
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3805
+#: src/protocols/oscar/oscar.c:3839
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3806
+#: src/protocols/oscar/oscar.c:3840
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3841
+#: src/protocols/oscar/oscar.c:3875
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3934
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:3957
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/oscar/oscar.c:3960
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3930 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:4046
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4416
+#: src/protocols/oscar/oscar.c:4450
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4417
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7313,166 +7496,166 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4480
+#: src/protocols/oscar/oscar.c:4514
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4482
+#: src/protocols/oscar/oscar.c:4516
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4513
+#: src/protocols/oscar/oscar.c:4547
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4783 src/protocols/oscar/oscar.c:4790
+#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4796
+#: src/protocols/oscar/oscar.c:4830
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4797 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4797 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4813
+#: src/protocols/oscar/oscar.c:4847
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4817
+#: src/protocols/oscar/oscar.c:4851
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4822
+#: src/protocols/oscar/oscar.c:4856
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4826 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:4864
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4872
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4839
+#: src/protocols/oscar/oscar.c:4873
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4840
+#: src/protocols/oscar/oscar.c:4874
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4841
+#: src/protocols/oscar/oscar.c:4875
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4843
+#: src/protocols/oscar/oscar.c:4877
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4849
+#: src/protocols/oscar/oscar.c:4883
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4933
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4920
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4958
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4941
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4962
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:4998
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4992
+#: src/protocols/oscar/oscar.c:5026
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4995
+#: src/protocols/oscar/oscar.c:5029
 #, 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:4998
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:5035
 #, 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:5004
+#: src/protocols/oscar/oscar.c:5038
 #, 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:5007
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:5010
+#: src/protocols/oscar/oscar.c:5044
 #, 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:5013
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7481,25 +7664,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5094
+#: src/protocols/oscar/oscar.c:5128
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5267
+#: src/protocols/oscar/oscar.c:5301
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5268
+#: src/protocols/oscar/oscar.c:5302
 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 "
@@ -7508,7 +7691,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5295
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7518,19 +7701,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5300
+#: src/protocols/oscar/oscar.c:5334
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5316 src/protocols/oscar/oscar.c:6596
+#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5334
+#: src/protocols/oscar/oscar.c:5368
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5335
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7539,7 +7722,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5409
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7551,11 +7734,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5380
+#: src/protocols/oscar/oscar.c:5414
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5466
+#: src/protocols/oscar/oscar.c:5500
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7565,16 +7748,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5467 src/protocols/oscar/oscar.c:5884
-#: src/protocols/oscar/oscar.c:5897
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5931
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5603
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5604
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -7583,13 +7766,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5780 src/protocols/oscar/oscar.c:5781
-#: src/protocols/oscar/oscar.c:5786 src/protocols/oscar/oscar.c:5941
-#: src/protocols/oscar/oscar.c:5942 src/protocols/oscar/oscar.c:5947
+#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7597,11 +7780,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5883 src/protocols/oscar/oscar.c:5896
+#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5896
+#: src/protocols/oscar/oscar.c:5930
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7611,18 +7794,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5978
+#: src/protocols/oscar/oscar.c:6012
 #, 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:5984
+#: src/protocols/oscar/oscar.c:6018
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6051
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7632,17 +7815,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6093
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6060
+#: src/protocols/oscar/oscar.c:6094
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:6097
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7652,71 +7835,71 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6064
+#: src/protocols/oscar/oscar.c:6098
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6101 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6123
+#: src/protocols/oscar/oscar.c:6157
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6213
+#: src/protocols/oscar/oscar.c:6247
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6370
+#: src/protocols/oscar/oscar.c:6404
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6646
+#: src/protocols/oscar/oscar.c:6688
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6662
+#: src/protocols/oscar/oscar.c:6706
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:6712
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6685
+#: src/protocols/oscar/oscar.c:6724
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6747
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6735
+#: src/protocols/oscar/oscar.c:6777
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6736
+#: src/protocols/oscar/oscar.c:6778
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6742
+#: src/protocols/oscar/oscar.c:6785
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6791
+#: src/protocols/oscar/oscar.c:6837
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6835
+#: src/protocols/oscar/oscar.c:6882
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6838
+#: src/protocols/oscar/oscar.c:6885
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6839
+#: src/protocols/oscar/oscar.c:6886
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7724,75 +7907,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6903
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:6904
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6857
+#: src/protocols/oscar/oscar.c:6905
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6874
+#: src/protocols/oscar/oscar.c:6922
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6875
+#: src/protocols/oscar/oscar.c:6923
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6951
+#: src/protocols/oscar/oscar.c:7004
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6958
+#: src/protocols/oscar/oscar.c:7009
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:7015
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7020
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6980
+#: src/protocols/oscar/oscar.c:7025
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6988
+#: src/protocols/oscar/oscar.c:7029
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7038
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7005
+#: src/protocols/oscar/oscar.c:7042
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7011
+#: src/protocols/oscar/oscar.c:7046
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7017
+#: src/protocols/oscar/oscar.c:7050
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7057
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7034
+#: src/protocols/oscar/oscar.c:7063
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:7068
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -7807,20 +7990,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7159 src/protocols/oscar/oscar.c:7161
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7180
+#: src/protocols/oscar/oscar.c:7204
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7209
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:401
-#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:661
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
+#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
 #: src/protocols/silc/ft.c:340
 #, c-format
 msgid "User %s is not present in the network"
@@ -7861,8 +8044,8 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "无法与您自己进行密钥协议"
 
-#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:369
-#: src/protocols/silc/buddy.c:480
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
+#: src/protocols/silc/buddy.c:500
 msgid "The remote user is not present in the network any more"
 msgstr "远程用户已经从网络中消失了"
 
@@ -7888,55 +8071,55 @@
 msgid "Key Agreement Request"
 msgstr "密钥协议请求"
 
-#: src/protocols/silc/buddy.c:368 src/protocols/silc/buddy.c:403
-#: src/protocols/silc/buddy.c:445
+#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
+#: src/protocols/silc/buddy.c:451
 msgid "IM With Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:404
+#: src/protocols/silc/buddy.c:410
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
 
-#: src/protocols/silc/buddy.c:446
+#: src/protocols/silc/buddy.c:452
 msgid "Set IM Password"
 msgstr "设定聊天密码"
 
-#: src/protocols/silc/buddy.c:479 src/protocols/silc/buddy.c:514
-#: src/protocols/silc/ops.c:1064 src/protocols/silc/ops.c:1075
+#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:515 src/protocols/silc/ops.c:1065
-#: src/protocols/silc/ops.c:1076
+#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:584 src/protocols/silc/buddy.c:1596
+#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
 msgid "Show Public Key"
 msgstr "显示公钥"
 
-#: src/protocols/silc/buddy.c:585 src/protocols/silc/buddy.c:944
-#: src/protocols/silc/chat.c:210
+#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/chat.c:218
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:662 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:892 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:976 src/protocols/silc/ops.c:982
-#: src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:663 src/protocols/silc/ops.c:893
+#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
-#: src/protocols/silc/buddy.c:684
+#: src/protocols/silc/buddy.c:722
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: src/protocols/silc/buddy.c:687
+#: src/protocols/silc/buddy.c:725
 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."
@@ -7944,127 +8127,199 @@
 "除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令来获取公"
 "钥。"
 
-#: src/protocols/silc/buddy.c:987
+#: src/protocols/silc/buddy.c:1025
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s 好友未出现于网络中"
 
-#: src/protocols/silc/buddy.c:990
+#: src/protocols/silc/buddy.c:1028
 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:993
+#: src/protocols/silc/buddy.c:1031
 msgid "Import..."
 msgstr "导入..."
 
-#: src/protocols/silc/buddy.c:1080
+#: src/protocols/silc/buddy.c:1118
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: src/protocols/silc/buddy.c:1082
+#: src/protocols/silc/buddy.c:1120
 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 ""
 "发现了多个用户使用同样的公钥。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: src/protocols/silc/buddy.c:1084
+#: src/protocols/silc/buddy.c:1122
 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 ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: src/protocols/silc/buddy.c:1358
+#: src/protocols/silc/buddy.c:1396
 msgid "Detached"
 msgstr "已脱离"
 
-#: src/protocols/silc/buddy.c:1362 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: src/protocols/silc/buddy.c:1366 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: src/protocols/silc/buddy.c:1368 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "多动"
 
-#: src/protocols/silc/buddy.c:1370
+#: src/protocols/silc/buddy.c:1408
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1377 src/protocols/silc/silc.c:605
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:607
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:609
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:611
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:613
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:615
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1389 src/protocols/silc/silc.c:617
+#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1391 src/protocols/silc/silc.c:619
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:621
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:623
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1397 src/protocols/silc/silc.c:625
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1471
+msgid "Modes"
+msgstr "模式"
+
+#: src/protocols/silc/buddy.c:1481
+msgid "Mood"
+msgstr "心情"
+
+#: src/protocols/silc/buddy.c:1511
+msgid "Status Text"
+msgstr "状态文本"
+
+#: src/protocols/silc/buddy.c:1516
+msgid "Preferred Contact"
+msgstr "首选联系人"
+
+#: src/protocols/silc/buddy.c:1524
+msgid "Paging"
+msgstr "寻呼"
+
+#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "短信"
+
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "彩信"
+
+#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: src/protocols/silc/buddy.c:1537
+msgid "Preferred Language"
+msgstr "首选语言"
+
+#: src/protocols/silc/buddy.c:1542
+msgid "Device"
+msgstr "设备"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Computer"
+msgstr "计算机"
+
+#: src/protocols/silc/buddy.c:1548
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1550
+msgid "Terminal"
+msgstr "终端"
+
+#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "时区"
+
+#: src/protocols/silc/buddy.c:1567
+msgid "Geolocation"
+msgstr "地理位置"
+
+#: src/protocols/silc/buddy.c:1626
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1582
+#: src/protocols/silc/buddy.c:1631
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1635
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1602
+#: src/protocols/silc/buddy.c:1646
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1651
 msgid "Send File..."
 msgstr "发送文件..."
 
-#: src/protocols/silc/buddy.c:1616 src/protocols/silc/ops.c:1111
+#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8077,8 +8332,8 @@
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:153
-#: src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
 msgid "Channel Information"
 msgstr "频道信息"
 
@@ -8086,24 +8341,24 @@
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:209
+#: src/protocols/silc/chat.c:217
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:264
+#: src/protocols/silc/chat.c:272
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:375
+#: src/protocols/silc/chat.c:383
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:390
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:387
+#: src/protocols/silc/chat.c:395
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8115,114 +8370,118 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:396 src/protocols/silc/chat.c:397
-#: src/protocols/silc/chat.c:434 src/protocols/silc/chat.c:435
-#: src/protocols/silc/chat.c:773
+#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:873
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:536
+#: src/protocols/silc/chat.c:562
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:540 src/protocols/silc/ops.c:1387
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:551
+#: src/protocols/silc/chat.c:577
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:553
+#: src/protocols/silc/chat.c:579
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:654
+#: src/protocols/silc/chat.c:706
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:655
+#: src/protocols/silc/chat.c:707
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:750
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "信息"
+
+#: src/protocols/silc/chat.c:856
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:756
+#: src/protocols/silc/chat.c:860
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:765
+#: src/protocols/silc/chat.c:867
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:780
+#: src/protocols/silc/chat.c:878
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:786
+#: src/protocols/silc/chat.c:882
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:795
+#: src/protocols/silc/chat.c:889
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:802
+#: src/protocols/silc/chat.c:894
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:808
+#: src/protocols/silc/chat.c:898
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:816
+#: src/protocols/silc/chat.c:904
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:822
+#: src/protocols/silc/chat.c:908
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:830
+#: src/protocols/silc/chat.c:914
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:836
+#: src/protocols/silc/chat.c:918
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:988
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:992
 #, 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:961
+#: src/protocols/silc/chat.c:1042
 #, 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:963
+#: src/protocols/silc/chat.c:1044
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:964
+#: src/protocols/silc/chat.c:1045
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1146 src/protocols/silc/silc.c:844
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1147 src/protocols/silc/silc.c:845
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -8320,267 +8579,173 @@
 msgstr "服务器登出"
 
 #: src/protocols/silc/ops.c:767
-msgid ""
-"Personal Information:\n"
-"\n"
-msgstr ""
-"个人信息:\n"
-"\n"
-
-#: src/protocols/silc/ops.c:769
-#, c-format
-msgid "Full Name:\t\t%s\n"
-msgstr "全名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:772
-#, c-format
-msgid "First Name:\t%s\n"
-msgstr "名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:775
-#, c-format
-msgid "Middle Names:\t%s\n"
-msgstr "中名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:778
-#, c-format
-msgid "Family Name:\t%s\n"
-msgstr "姓:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:781 src/protocols/silc/ops.c:911
-#, c-format
-msgid "Nickname:\t\t%s\n"
-msgstr "昵称:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:784
-#, c-format
-msgid "Birth Day:\t\t%s\n"
-msgstr "生日:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:787
-#, c-format
-msgid "Job Title:\t\t%s\n"
-msgstr "职称:\t\t%s\n"
+msgid "Personal Information"
+msgstr "个人信息"
 
 #: src/protocols/silc/ops.c:790
-#, c-format
-msgid "Job Role:\t\t%s\n"
-msgstr "职位:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:793
-#, c-format
-msgid "Organization:\t%s\n"
-msgstr "组织:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:796
-#, c-format
-msgid "Unit:\t\t%s\n"
-msgstr "单元:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:799
-#, c-format
-msgid "Homepage:\t%s\n"
-msgstr "主页:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:802
-#, c-format
-msgid "Address:\t%s\n"
-msgstr "地址:\t\t%s\n"
+msgid "Birth Day"
+msgstr "生日"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "职称"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "职位"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "组织"
 
 #: src/protocols/silc/ops.c:806
-#, c-format
-msgid "Tel:\t\t\t%s\n"
-msgstr "电话:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:811
-#, c-format
-msgid "EMail:\t\t%s\n"
-msgstr "电子邮件:\t%s\n"
-
-#: src/protocols/silc/ops.c:815
-#, c-format
-msgid ""
-"\n"
-"Note:\t\t%s\n"
-msgstr ""
-"\n"
-"注释:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:862
+msgid "Unit"
+msgstr "单元"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "电子邮件"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "备注"
+
+#: src/protocols/silc/ops.c:878
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:913
-#, c-format
-msgid "Real Name:\t%s\n"
-msgstr "真名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:915
-#, c-format
-msgid "Username:\t\t%s\n"
-msgstr "用户名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:917
-#, c-format
-msgid "Hostname:\t\t%s\n"
-msgstr "主机名:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:919
-#, c-format
-msgid "Server:\t\t%s\n"
-msgstr "服务器:\t\t%s\n"
-
-#: src/protocols/silc/ops.c:924
-#, c-format
-msgid "User Mode:\t%s\n"
-msgstr "用户模式:\t%s\n"
-
-#: src/protocols/silc/ops.c:938
-msgid ""
-"\n"
-"Channels:\n"
-msgstr ""
-"\n"
-"频道:\n"
-
-#: src/protocols/silc/ops.c:965
-#, c-format
-msgid ""
-"\n"
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"公钥指纹:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/ops.c:966
-#, c-format
-msgid ""
-"Public Key Babbleprint:\n"
-"%s"
-msgstr ""
-"公钥漏印: \n"
-"%s"
-
-#: src/protocols/silc/ops.c:979
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "主机名"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "用户模式"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "频道"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "公钥指纹"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "公钥漏印"
+
+#: src/protocols/silc/ops.c:995
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:990 src/protocols/silc/silc.c:744
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:990
+#: src/protocols/silc/ops.c:1006
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1001
+#: src/protocols/silc/ops.c:1017
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1029
+#: src/protocols/silc/ops.c:1045
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1029
+#: src/protocols/silc/ops.c:1045
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: src/protocols/silc/ops.c:1077
+#: src/protocols/silc/ops.c:1093
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1090 src/protocols/silc/ops.c:1103
-#: src/protocols/silc/ops.c:1104
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1107
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1112
+#: src/protocols/silc/ops.c:1128
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1189
+#: src/protocols/silc/ops.c:1205
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1194
+#: src/protocols/silc/ops.c:1210
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1203
+#: src/protocols/silc/ops.c:1219
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1209
-msgid "Connection timeout"
-msgstr "连接超时"
-
-#: src/protocols/silc/ops.c:1238
+#: src/protocols/silc/ops.c:1254
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1298 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1300
+#: src/protocols/silc/ops.c:1316
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1347
+#: src/protocols/silc/ops.c:1363
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1388
+#: src/protocols/silc/ops.c:1404
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1417
+#: src/protocols/silc/ops.c:1433
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1420
+#: src/protocols/silc/ops.c:1436
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1423
+#: src/protocols/silc/ops.c:1439
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1426
+#: src/protocols/silc/ops.c:1442
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1429
+#: src/protocols/silc/ops.c:1445
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1432
+#: src/protocols/silc/ops.c:1448
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1435
+#: src/protocols/silc/ops.c:1451
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1437
+#: src/protocols/silc/ops.c:1453
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1455
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1450
+#: src/protocols/silc/ops.c:1466
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -8642,15 +8807,15 @@
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:601
+#: src/protocols/silc/silc.c:602
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:603
+#: src/protocols/silc/silc.c:604
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:628
+#: src/protocols/silc/silc.c:629
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -8658,47 +8823,31 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:636
-msgid "SMS"
-msgstr "短信"
-
-#: src/protocols/silc/silc.c:638
-msgid "MMS"
-msgstr "彩信"
-
-#: src/protocols/silc/silc.c:640
-msgid "Video Conferencing"
-msgstr "视频会议"
-
-#: src/protocols/silc/silc.c:645
+#: src/protocols/silc/silc.c:646
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:652
+#: src/protocols/silc/silc.c:653
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:655
+#: src/protocols/silc/silc.c:656
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:661
+#: src/protocols/silc/silc.c:662
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:668
+#: src/protocols/silc/silc.c:669
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:673 src/protocols/silc/silc.c:675
-msgid "Timezone"
-msgstr "时区"
-
-#: src/protocols/silc/silc.c:681 src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:684
 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 "
@@ -8707,64 +8856,64 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:723
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:721
+#: src/protocols/silc/silc.c:724
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:737
+#: src/protocols/silc/silc.c:740
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:750
+#: src/protocols/silc/silc.c:749
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:815
+#: src/protocols/silc/silc.c:813
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:895
+#: src/protocols/silc/silc.c:907
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:900
+#: src/protocols/silc/silc.c:912
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:905
+#: src/protocols/silc/silc.c:917
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:908
+#: src/protocols/silc/silc.c:920
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:913
+#: src/protocols/silc/silc.c:925
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:918
+#: src/protocols/silc/silc.c:930
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:921
+#: src/protocols/silc/silc.c:933
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:926
+#: src/protocols/silc/silc.c:938
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:931
+#: src/protocols/silc/silc.c:943
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -8778,40 +8927,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1016
+#: src/protocols/silc/silc.c:1026
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/silc/silc.c:1028
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1048
+#: src/protocols/silc/silc.c:1058
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1054
+#: src/protocols/silc/silc.c:1064
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1058
+#: src/protocols/silc/silc.c:1068
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1063
+#: src/protocols/silc/silc.c:1073
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1066
+#: src/protocols/silc/silc.c:1076
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1069
+#: src/protocols/silc/silc.c:1079
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1072
+#: src/protocols/silc/silc.c:1082
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -8819,114 +8968,134 @@
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "真名"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "用户名"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "主机名"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "算法"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "密钥长度"
+
 #: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/toc/toc.c:166
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:539
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:542
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:545
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:548
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:557
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:560
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:564
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:567
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:573
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:576
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:579
 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."
@@ -8934,37 +9103,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:581
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:604
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:644
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:714
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:902
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
+#: src/protocols/toc/toc.c:906
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 发送了 PAUSE 命令。"
+
 #: src/protocols/toc/toc.c:907
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC 发送了 PAUSE 命令。"
-
-#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -8974,43 +9143,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1417
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1553
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1671
+#: src/protocols/toc/toc.c:1675
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1707
+#: src/protocols/toc/toc.c:1711
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1752 src/protocols/toc/toc.c:1792
-#: src/protocols/toc/toc.c:1916 src/protocols/toc/toc.c:2004
+#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
+#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1949
+#: src/protocols/toc/toc.c:1953
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2049
+#: src/protocols/toc/toc.c:2053
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2090
+#: src/protocols/toc/toc.c:2094
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -9026,15 +9195,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2172 src/protocols/toc/toc.c:2174
+#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2193
+#: src/protocols/toc/toc.c:2195
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2197
+#: src/protocols/toc/toc.c:2199
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9091,7 +9260,7 @@
 msgid "Profile"
 msgstr "资料"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "设置资料"
 
@@ -9118,46 +9287,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1280 src/protocols/trepia/trepia.c:1282
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:307
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:868
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:871
 #, 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:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1601
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9167,11 +9336,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1677
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9179,76 +9348,76 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1719
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "您的账户已锁定,请登录到 Yahoo 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的错误代码 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1779
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
+#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2776
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -9257,73 +9426,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:2973
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2996
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>抱歉,目前不支持非英语的个人资料。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/yahoo/yahoo.c:3095
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:3076
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:3080
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:3082
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
@@ -9338,27 +9507,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
@@ -9457,19 +9626,15 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1165
-msgid "ZLocate"
-msgstr "ZLocate"
-
-#: src/protocols/zephyr/zephyr.c:1207
+#: src/protocols/zephyr/zephyr.c:1191
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1213
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1219
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
@@ -9484,19 +9649,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1371 src/protocols/zephyr/zephyr.c:1373
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "暴露"
 
@@ -9641,30 +9806,30 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2128
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2131
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2162 src/util.c:2167 src/util.c:2172 src/util.c:2175
+#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2163 src/util.c:2167 src/util.c:2181 src/util.c:2183
+#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2163 src/util.c:2172 src/util.c:2181 src/util.c:2186
+#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2523
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"