changeset 13278:c7cf6912c982

[gaim-migrate @ 15644] 3 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 13 Feb 2006 21:34:34 +0000 (2006-02-13)
parents 2a9580fc922b
children 0c50401679d3
files po/ChangeLog po/fr.po po/he.po po/sl.po
diffstat 4 files changed, 12373 insertions(+), 10514 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Mon Feb 13 20:06:09 2006 +0000
+++ b/po/ChangeLog	Mon Feb 13 21:34:34 2006 +0000
@@ -13,6 +13,7 @@
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Estonian translation updated (Ivar Smolin)
 	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (�ric Boumaour)
 	* Galician translation updated (Ignacio Casal Quinteiro)
 	* Galician win32 installer translation updated (Ignacio Casal Quinteiro)
 	* Georgian translation updated (Ubuntu Georgian Translators Team)
--- a/po/fr.po	Mon Feb 13 20:06:09 2006 +0000
+++ b/po/fr.po	Mon Feb 13 21:34:34 2006 +0000
@@ -1,26 +1,26 @@
 # Gaim French translation
+# 
 # Copyright (C) 2001-2002, S辿bastien Fran巽ois <sebfrance@ifrance.com>
 # Copyright (C) 2002, St辿phane Pontier <stephane.pontier@free.fr>
 # Copyright (C) 2002, St辿phane Wirtel <stephane.wirtel@belgacom.net>
 # Copyright (C) 2002, Lo誰c Jeannin <loic.jeannin@free.fr>
-# Copyright (C) 2002-2005, �ric Boumaour <zongo_fr@users.sourceforge.net>
+# Copyright (C) 2002-2006, �ric Boumaour <zongo_fr@users.sourceforge.net>
 # 
 # This file is distributed under the same license as the Gaim package.
 # 
-# 
 # Avant de soumettre des changements ou des conseils de traduction,
 # consultez le document des r竪gles de traduction en fran巽ais de Mozilla.
 # Ces r竪gles servent de base pour ce fichier.
-#   http://frenchmozilla.sourceforge.net/pages/regles.html
+# http://frenchmozilla.sourceforge.net/pages/regles.html
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-10 14:29+0200\n"
-"Last-Translator: �ric <zongo_fr@users.sourceforge.net>\n"
+"POT-Creation-Date: 2006-02-13 07:46+0100\n"
+"PO-Revision-Date: 2006-02-13 07:59+0100\n"
+"Last-Translator: �ric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,22 +39,64 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Envoie des messages instantan辿s en utilisant divers protocoles"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Supprimer les messages d'erreur"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Cacher les fen棚tres de d辿connexion"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Cacher les fen棚tres d'erreurs � la connexion"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Cacher les fen棚tres de d辿connexion"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Test de chiffre"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Teste le syst竪me de chiffrement int辿gr辿 � Gaim."
+
+#: ../plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "L'utilisateur est inactif"
+
+#: ../plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "L'utilisateur est absent"
+
+#: ../plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "L'utilisateur est en absence prolong辿e"
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "L'utilisateur est sur t辿l辿phone portable"
+
+#: ../plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "L'utilisateur est d辿connect辿"
+
+#: ../plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Choisissez les valeurs � utiliser quand..."
+
+#: ../plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Le nom d'utilisateur avec le score <i>le plus grand</i> sera l'entr辿e "
+"utilis辿e pour le contact>\n"
+
+#: ../plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Utiliser l'utilisateur pr辿c辿dent tant que les scores sont 辿gaux"
+
+#: ../plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Choisissez les valeurs � utiliser pour chaque compte..."
 
 #. *< type
 #. *< ui_requirement
@@ -62,72 +104,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Reconnexion automatique"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Ce plugin vous reconnecte automatiquement � chaque d辿connexion."
-
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr "Choisissez les valeurs � utiliser quand..."
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "L'utilisateur est d辿connect辿�:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "L'utilisateur est absent�:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "L'utilisateur est inactif�:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "� valeur 辿gale, choisir le dernier trouv辿"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"L'utilisateur avec le plus petit score aura la priorit辿 dans le contact.\n"
-"Les valeurs par d辿faut (d辿connect辿�4, absent�2 et inactif�1) imitent le "
-"comportement initial de Gaim pour le tri�: actif, inactif, absent, absent et "
-"inactif puis en dernier d辿connect辿."
-
-#: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
-msgstr "Choisissez la valeur � ajouter pour chaque compte..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "Priorit辿 du contact"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -135,7 +119,7 @@
 "dans un contact."
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:187
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -143,57 +127,58 @@
 "Permet de changer les valeurs attribu辿es aux 辿tats inactif, absent et "
 "d辿connect辿 pour le calcul de la priorit辿 des utilisateurs d'un contact."
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - D辿connect辿"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Absent"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "Liste de contacts"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Nouveau message..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Joindre une discussion..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Silencieux"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Transferts de fichier"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Comptes"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Pr辿f辿rences"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "Quitter"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Plugin pour 辿tablir une session de Crazychat"
+
+#. *  description
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+"Utilise Gaim pour r辿cup辿rer les adresses IP des contacts avec lesquels se "
+"connecter pour une session de Crazychat."
+
+#. make the network configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Configuration du r辿seau"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Port TCP"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Port UDP"
+
+#. make the feature configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "�talonnage facial"
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:577
+msgid "Enabled"
+msgstr "Activ辿"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "D辿sactiv辿"
 
 #. *< type
 #. *< ui_requirement
@@ -201,44 +186,192 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "Exemple de plugin DBus"
+
+#: ../plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "Clic droit pour plus de messages non lus...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3286
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d message non lu de %s\n"
+msgstr[1] "%d messages non lus de %s\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Changer d'辿tat"
+
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:663
+#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
+#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
+#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
+#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:155
+msgid "Available"
+msgstr "Disponible"
+
+#. Away stuff
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:664 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
+#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3187
+#: ../src/status.c:158
+msgid "Away"
+msgstr "Absent"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:665
+#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3016
+#: ../src/gtkstatusbox.c:666 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:154
+msgid "Offline"
+msgstr "D辿connect辿"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:671
+msgid "New..."
+msgstr "Nouveau..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
+msgid "Saved..."
+msgstr "Sauv辿..."
+
+#: ../plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "Afficher la liste de contacts"
+
+#: ../plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "Messages non lus"
+
+#: ../plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "Nouveau message..."
+
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+msgid "Preferences"
+msgstr "Pr辿f辿rences"
+
+#: ../plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "Silencieux"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "Faire clignoter l'ic担ne de notification pour les messages non lus..."
+
+#: ../plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "Messages _instantan辿s�:"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:411 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+msgid "Never"
+msgstr "Jamais"
+
+#: ../plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "Pour les conversations cach辿es"
+
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:825
+msgid "Always"
+msgstr "Toujours"
+
+#: ../plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "Discussions�:"
+
+#: ../plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "Quand mon pseudo appara樽t"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "Ic担ne de notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Affiche une ic担ne pour Gaim dans la zone de notification."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Permet l'interaction avec une zone de notification (pour Gnome, KDE ou "
-"Windows par exemple) pour afficher le status de Gaim et permettre un acc竪s "
-"rapide aux fonctions usuelles, changer l'affichage de la liste de contacts "
-"ou la fen棚tre de connexions. Il permet aussi de cacher les messages en "
-"attente jusqu'au clic sur l'ic担ne (comme ICQ)."
-
-#: plugins/extplacement.c:79
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
+msgstr ""
+"Ajoute une ic担ne de notification (pour Gnome, KDE ou Windows par exemple) "
+"pour afficher l'辿tat de Gaim, permettre un acc竪s rapide aux fonctions "
+"usuelles et cacher ou non la liste de contacts. Il permet aussi de pr辿venir "
+"quand il reste des messages non lus."
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "Disposition"
+
+#: ../plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "Orientation de l'espace de notification"
+
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Par nombre de conversations"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Emplacement des conversations"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Nombre de conversations par fen棚tre"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "S辿parer les messages et les discussions quand leur nombre par fen棚tre est "
@@ -250,24 +383,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "ExtEmplacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "Options suppl辿mentaires d'emplacement des conversations"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Limite le nombre de conversation par fenetre ou permet d'utiliser des "
+"Limite le nombre de conversation par fen棚tre ou permet d'utiliser des "
 "fen棚tres diff辿rentes pour les messages et les discussions."
 
 #. *< type
@@ -276,7 +409,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Contr担le de Gaim par fichier"
 
@@ -284,9 +417,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Permet de controler Gaim en entrant des commandes dans un fichier."
+msgstr "Permet de contr担ler Gaim en entrant des commandes dans un fichier."
 
 #. *< type
 #. *< ui_requirement
@@ -294,19 +427,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Plugin de d辿monstration"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
-msgstr "Un example de plugin -- cf. description."
+msgstr "Un exemple de plugin -- cf. description."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -318,102 +451,128 @@
 "- il 辿crit � l'envers tous les messages re巽us\n"
 "- il envoie automatiquement un message � tous les contacts qui se connectent"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
+msgstr "Couleur du curseur"
+
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
+msgstr "Deuxi竪me couleur du curseur"
+
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Couleur des liens hypertextes"
 
-#: plugins/gaimrc.c:53
-#, fuzzy
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
-msgstr "Taille de l'辿tendeur"
-
-#: plugins/gaimrc.c:72
-#, fuzzy
+msgstr "Taille de l'辿tendeur GtkTreeView"
+
+#: ../plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "S辿paration horizontale GtkTreeView"
+
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
-msgstr "Conversations"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
+msgstr "Ligne de conversation"
+
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
-msgstr "Conversations"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
+msgstr "Archive de conversation"
+
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "Serveur de connexion"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
+msgstr "Afficheur d'archives"
+
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
-msgstr "Requ棚te ambigu谷"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
+msgstr "Boite de message pour requ棚te"
+
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
-msgstr "Notification pour"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+msgstr "Boite de message de notification"
+
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Indentation des 辿tendeurs GtkTreeView"
+
+#: ../plugins/gaimrc.c:287
+#, c-format
 msgid "Select Color for %s"
-msgstr "Changer la couleur du texte"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "Choisissez la couleur pour %s"
+
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
-msgstr "Changer la couleur du texte"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "Choisissez la couleur"
+
+#: ../plugins/gaimrc.c:324
+#, c-format
 msgid "Select Font for %s"
-msgstr "Changer la police"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "Choisissez la police pour %s"
+
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
-msgstr "Changer la police"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "Choisissez la police"
+
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "G辿n辿ral"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
-msgstr "Interface"
-
-#: plugins/gaimrc.c:362
+msgstr "Police de l'interface GTK+"
+
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
+msgstr "Raccourci du th竪me GTK+"
+
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "Couleurs de l'interface"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "Tailles des 辿l辿ments"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Polices"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "Outils"
+
+#: ../plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "�crire les pr辿f辿rences dans %s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:556
+msgid "Re-read gtkrc files"
+msgstr "Relire les fichiers gtkrc"
+
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
-msgstr "Contr担le de Gaim par fichier"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Contr担le du th竪me GTK+ Gaim"
+
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Fournit un acc竪s aux pr辿f辿rences couramment utilis辿s du fichier gtkrc."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configuration des mouvements de souris"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Bouton du milieu"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Bouton de droite"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "Montrer _visuellement le mouvement"
 
@@ -423,19 +582,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "Mouvements de souris"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "Fournit le support pour les mouvements de souris."
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -453,49 +612,51 @@
 "pr辿c辿dente.\n"
 "Glissez vers le haut puis la droite pour passer � la conversation suivante."
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1524
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Messagerie instantan辿e"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Choisissez une personne dans votre carnet d'adresses ou cr辿ez une nouvelle "
 "personne."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/sametime/sametime.c:5533
 msgid "Search"
 msgstr "Recherche"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4919
 msgid "Group:"
 msgstr "Groupe�:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nouvelle personne"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "Choisir contact"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -504,56 +665,62 @@
 "ou cr辿ez une nouvelle personne."
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "Cacher les d辿tails du contact"
+msgstr "_D辿tails du contact"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Associer un contact"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1122
+msgid "None"
+msgstr "Aucun"
+
+#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
+#: ../src/gtkblist.c:4364 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Contacts"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "Impossible d'envoyer le message"
-
-#: plugins/gevolution/gevolution.c:263
+msgstr "Impossible d'envoyer un courrier 辿lectronique"
+
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
+"Le binaire 束�evolution�損 n'a pas 辿t辿 trouv辿 dans les dossiers par d辿faut du "
+"PATH."
+
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+msgstr "Le contact choisi n'a pas 辿t辿 trouv辿 dans les contacts d'Evolution."
+
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
-msgstr "Courriel"
+msgstr "Envoyer un courriel"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Configuration de l'int辿gration avec Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420
 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:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
 msgid "Account"
 msgstr "Compte"
 
@@ -563,7 +730,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Int辿gration avec Evolution"
 
@@ -571,87 +738,110 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr "Fournit une int辿gration avec Evolution de Ximian."
-
-#: plugins/gevolution/new_person_dialog.c:266
+msgstr "Fournit une int辿gration avec Evolution."
+
+#: ../plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Veuillez saisir les informations de la personne"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Veuillez saisir le pseudo et le type de compte du contact"
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Type de compte�:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "Utilisateur�:"
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+msgid "Screen name:"
+msgstr "Nom d'utilisateur�:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Informations facultatives�:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
 msgid "Buddy Icon"
 msgstr "Ic担ne du contact"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Pr辿nom�:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Nom�:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "Adresse 辿lectronique�:"
 
-#: plugins/history.c:146
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "Historique"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Affiche l'historique dans les nouvelles conversations."
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Test des signaux GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"V辿rifie que tous les signaux de l'interface graphique fonctionnent "
+"correctement."
+
+#: ../plugins/history.c:143
+msgid "History Plugin Requires Logging"
+msgstr "Le plugin d'historique n辿cessite l'activation des archives."
+
+#: ../plugins/history.c:144
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Les archives peuvent 棚tre activ辿s dans Outils -> Pr辿f辿rences -> Archives.\n"
+"\n"
+"L'activation des archives pour les messages instantan辿s et/ou les salons de "
+"discussion permettra l'utilisation de l'historique pour ces types de "
+"messages."
+
+#: ../plugins/history.c:184
+msgid "History"
+msgstr "Historique"
+
+#: ../plugins/history.c:186
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Affiche l'historique dans les nouvelles conversations."
+
+#: ../plugins/history.c:187
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Quand une nouvelle conversation est ouverte, le plugin rajoute la derni竪re "
+"conversation avec l'interlocuteur dans la fen棚tre."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ic担nifier lors des absences"
 
@@ -659,49 +849,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 "Met en ic担ne la liste de contacts et les conversations lors des absences."
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "Minutes"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
+#: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
 msgstr "I'nactivat'eur"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: ../plugins/idle.c:160 ../plugins/idle.c:249
 msgid "Set Account Idle Time"
 msgstr "Dur辿e d'inactivit辿 pour le compte"
 
-#: plugins/idle.c:126
+#: ../plugins/idle.c:163 ../plugins/idle.c:221
 msgid "_Set"
 msgstr "_Changer"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: ../plugins/idle.c:177
+msgid "None of your accounts are idle."
+msgstr "Aucun de vos comptes n'est inactif."
+
+#: ../plugins/idle.c:193 ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
-msgstr "Dur辿e d'inactivit辿 pour le compte"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "D辿sactiver le temps d'inactivit辿 pour le compte"
+
+#: ../plugins/idle.c:196
 msgid "_Unset"
-msgstr "_Utiliser"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "_D辿sactiver"
+
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "Changer le temps d'inactivit辿 pour tous les comptes"
+
+#: ../plugins/idle.c:262
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "D辿sactiver le temps d'inactivit辿 pour tous les comptes inactifs"
+
+#: ../plugins/idle.c:308 ../plugins/idle.c:309
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Permet de changer manuellement le temps d'inactivit辿"
+msgstr "Permet de changer manuellement le temps d'inactivit辿."
 
 #. *< type
 #. *< ui_requirement
@@ -709,19 +905,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Test pour le client IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Plugin de test du support d'IPC en tant que client"
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -735,106 +931,287 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Test pour le serveur IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Plugin de test du support d'IPC en tant que serveur"
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Teste le support du serveur IPC. Enregistre les commandes IPC."
 
-#: plugins/mailchk.c:160
+#: ../plugins/log_reader.c:1407
+msgid "User is offline."
+msgstr "L'utilisateur est d辿connect辿."
+
+#: ../plugins/log_reader.c:1413
+msgid "Auto-response sent:"
+msgstr "R辿ponse automatique envoy辿e�:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#, c-format
+msgid "%s logged out."
+msgstr "%s vient de se d辿connecter"
+
+#: ../plugins/log_reader.c:1440
+msgid "One or more messages may have been undeliverable."
+msgstr "Un ou plusieurs messages ne sont peut-棚tre pas arriv辿s � destination."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Vous avez 辿t辿 d辿connect辿 du serveur"
+
+#: ../plugins/log_reader.c:1458
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Vous 棚tes actuellement d辿connect辿. Vous ne pouvez pas recevoir de messages � "
+"moins de vous connecter."
+
+#: ../plugins/log_reader.c:1473
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+"Le message n'a pas pu 棚tre envoy辿 car la taille maximale a 辿t辿 d辿pass辿e."
+
+#: ../plugins/log_reader.c:1478
+msgid "Message could not be sent."
+msgstr "Le message n'a pas pu 棚tre envoy辿."
+
+#. Add general preferences.
+#: ../plugins/log_reader.c:1912
+msgid "General Log Reading Configuration"
+msgstr "Configuration g辿n辿ral du lecteur d'archives."
+
+#: ../plugins/log_reader.c:1916
+msgid "Fast size calculations"
+msgstr "Calcul rapide de la taille"
+
+#: ../plugins/log_reader.c:1920
+msgid "Use name heuristics"
+msgstr "Utiliser une heuristique sur les noms"
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1926
+msgid "Log Directory"
+msgstr "Dossier des archives"
+
+#: ../plugins/log_reader.c:1930
+msgid "Adium"
+msgstr "Adium"
+
+#: ../plugins/log_reader.c:1934
+msgid "Fire"
+msgstr "Fire"
+
+#: ../plugins/log_reader.c:1938
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: ../plugins/log_reader.c:1942
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: ../plugins/log_reader.c:1946
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/log_reader.c:1969
+msgid "Log Reader"
+msgstr "Lecteur d'archives"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../plugins/log_reader.c:1973
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+"Inclut les archives d'autres clients de messagerie dans le lecteur "
+"d'archives."
+
+#. * description
+#: ../plugins/log_reader.c:1977
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+"Quand les archives sont consult辿s, ce plugin ajoute les archives d'autres "
+"clients de messagerie instantan辿e. Cela inclut actuellement Adium, Fire, "
+"Messenger Plus!, MSN Messenger et Trillian."
+
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Nouveaux courriers"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr ""
 "V辿rifie le contenu de la bo樽te au lettres locale pour des nouveaux courriers."
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Ajoute une petite zone de notification dans la liste de contacts pour "
 "indiquer l'arriv辿e de nouveaux courriers."
 
+#: ../plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Chargeur de plugins Mono"
+
+#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Charge les plugins .NET � l'aide de Mono."
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Une partie de messagerie musicale a 辿t辿 demand辿e. Veuillez cliquer sur "
+"l'ic担ne MM pour l'accepter."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Partie de messagerie musicale confirm辿e."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Messagerie musicale"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "Un conflit a eu lieu en ex辿cutant la commande�:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Erreur � l'ex辿cution de l'辿diteur"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "L'erreur suivante est survenue�:"
+
+#. Configuration frame
+#: ../plugins/musicmessaging/musicmessaging.c:623
+msgid "Music Messaging Configuration"
+msgstr "Configuration de messagerie musicale"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "Chemin de l'辿diteur de partitions"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+msgid "_Apply"
+msgstr "_Appliquer"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Plugin de messagerie musicale pour la composition collaborative."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Permet � plusieurs utilisateurs de travailler simultan辿ment sur un morceau "
+"de musique en modifiant une partition commune en temps r辿el."
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "Notification pour"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "Fen棚tres de _message"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "Fen棚tres de _discussions"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t_Seulement quand on dit votre pseudonyme"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "_Fen棚tres actives"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "M辿thode de notification"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "Pr辿fixer un _texte au titre de la fen棚tre�:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "Mettre le n_ombre de nouveaux messages dans le titre de la fen棚tre"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Envoyer le message 束�_URGENT�損 au gestionnaire de fen棚tres"
 
 #. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "Fen棚tres de messages"
+msgstr "Passer la conversation en _avant plan"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "Suppression de la notification"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "Supprimer quand la _fen棚tre devient active"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "Supprimer quand la fen棚tre est _cliqu辿e"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "Supprimer lors de l'辿c_riture dans la fen棚tre"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "Enlever sur envoi d'un _message"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "Supprimer lors du changement d'_onglet"
 
@@ -844,7 +1221,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "Notification de message"
 
@@ -852,9 +1229,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Fournit diff辿rents moyens d'avertissement de messages non-lus."
+msgstr "Fournit diff辿rents moyens d'avertissement de messages non lus."
 
 #. *< type
 #. *< ui_requirement
@@ -862,26 +1239,59 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Chargeur de plugins Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Fournit le support pour charger des plugins Perl"
 
-#: plugins/raw.c:151
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Mode psychique"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Mode psychique pour le d辿but des nouvelles conversations."
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Ouvre les fen棚tres des nouvelles conversations d竪s qu'un utilisateur "
+"commence � vous 辿crire un message. Celq fonctionne pour AIM, ICQ, Jabber, "
+"Sametime et Yahoo."
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "Vous sentez une perturbation dans la force..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "Activer uniquement pour les utilisateurs dans ma liste de contacts"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "D辿sactiver pendant les absences"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "Afficher un message de notification dans les conversations"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Brut"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permet d'envoyer des donn辿es brutes � un protocole en mode texte."
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -890,12 +1300,12 @@
 "MSN, IRC, TOC). Tapez 束�Entr辿e�損 dans la bo樽te de saisie pour envoyer. "
 "Observez le r辿sultat dans la fen棚tre de debug."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Vous utilisez Gaim version %s. La derni竪re version est %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -904,7 +1314,7 @@
 "<b>Nouveaut辿s�:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -913,7 +1323,7 @@
 "Vous pouvez t辿l辿charger la version %s sur�:<br><a href=\"http://gaim."
 "sourceforge.net/\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Nouvelle version disponible"
 
@@ -923,19 +1333,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Notification de nouvelle version"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "V辿rifie p辿riodiquement pour de nouvelles mises � jour."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -949,7 +1359,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:674
 msgid "Signals Test"
 msgstr "Test des 辿v辿nements"
 
@@ -957,7 +1367,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:677 ../plugins/signals-test.c:679
 msgid "Test to see that all signals are working properly."
 msgstr "V辿rifie que tous les 辿v辿nements fonctionnent correctement."
 
@@ -967,7 +1377,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Plugin simple"
 
@@ -975,55 +1385,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "V辿rifie que la plupart des choses fonctionne correctement."
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1902
 msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1789
+msgstr "Correction en double"
+
+#: ../plugins/spellchk.c:1903
 msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
+msgstr "Le mot existe d辿j� dans la liste de corrections."
+
+#: ../plugins/spellchk.c:2112
 msgid "Text Replacements"
 msgstr "Substitutions de texte"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2135
 msgid "You type"
 msgstr "Vous saisissez"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2149
 msgid "You send"
 msgstr "Vous envoyez"
 
-#: plugins/spellchk.c:1996
+#: ../plugins/spellchk.c:2163
 msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
+msgstr "Mots entiers uniquement"
+
+#: ../plugins/spellchk.c:2175
+msgid "Case sensitive"
+msgstr "Sensible � la casse"
+
+#: ../plugins/spellchk.c:2201
 msgid "Add a new text replacement"
 msgstr "Ajouter une nouvelle substitution"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2217
 msgid "You _type:"
 msgstr "Vous _saisissez�:"
 
-#: plugins/spellchk.c:2048
+#: ../plugins/spellchk.c:2234
 msgid "You _send:"
 msgstr "Vous _envoyez�:"
 
-#: plugins/spellchk.c:2060
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2246
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "Correspondance _parfaite uniquement (d辿coche la gestion automatique)"
+
+#: ../plugins/spellchk.c:2248
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
+msgstr "Remplace uniquement les mots _complets"
+
+#: ../plugins/spellchk.c:2273
+msgid "General Text Replacement Options"
+msgstr "Options de substitutions globales de texte"
+
+#: ../plugins/spellchk.c:2274
+msgid "Enable replacement of last word on send"
+msgstr "Permet la substitution des mots � l'envoi"
+
+#: ../plugins/spellchk.c:2299
 msgid "Text replacement"
 msgstr "Substitutions de texte"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2301 ../plugins/spellchk.c:2302
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Remplace le texte dans les messages envoy辿s gr但ce � des r竪gles de "
@@ -1035,7 +1462,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1043,7 +1470,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fournit le support SSL gr但ce � la biblioth竪que GNUTLS"
 
@@ -1053,7 +1480,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:411
 msgid "NSS"
 msgstr "NSS"
 
@@ -1061,7 +1488,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:414 ../plugins/ssl/ssl-nss.c:416
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fournit le support SSL gr但ce � la biblioth竪que NSS"
 
@@ -1071,7 +1498,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1079,49 +1506,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fournit une interface pour les biblioth竪ques SSL"
 
-#: plugins/statenotify.c:42
+#: ../plugins/statenotify.c:49
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s n'est plus absent"
+
+#: ../plugins/statenotify.c:51
 #, c-format
 msgid "%s has gone away."
 msgstr "%s est pass辿 absent"
 
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s n'est plus absent"
-
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s est devenu inactif"
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s n'est plus inactif"
 
-#: plugins/statenotify.c:74
+#: ../plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s vient de se connecter."
+
+#: ../plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s vient de se d辿connecter ."
+
+#: ../plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Notification quand"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "L'utilisateur s'absente"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "L'utilisateur passe inactif"
 
+#: ../plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "_Connexion/d辿connexion d'un contact"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:141
 msgid "Buddy State Notification"
 msgstr "Notification de changement d'辿tat"
 
@@ -1129,7 +1570,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1137,11 +1578,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:363
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Chargeur de plugins Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fournit le support pour charger des plugins Tcl"
 
@@ -1151,7 +1592,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "D辿filement des contacts"
 
@@ -1159,19 +1600,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Une version horizontale avec d辿filement de la liste de contacts."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:188
 msgid "iChat Timestamp"
 msgstr "Horodatage iChat"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:195
 msgid "Delay"
 msgstr "Intervalle"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:202
 msgid "minutes."
 msgstr "minutes"
 
@@ -1181,7 +1622,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:264
 msgid "Timestamp"
 msgstr "Horodatage"
 
@@ -1189,53 +1630,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Ajoute l'heure dans la conversation � intervalle r辿gulier."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Opacit辿�:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Fen棚tres de messages"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Fen棚tre de _messages transparente"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Afficher la barre de d辿filement dans la fen棚tre"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "Fen棚tre de _messages transparente"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
-msgid "Always on top"
-msgstr "Donner un alias � un contact"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Fen棚tre de la liste de contacts"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Fen棚tre de la liste de _contacts transparente"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Fen棚tre de la liste de _contacts transparente"
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Options du formatage de l'horodatage"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forcer au format 24 heures (traditionnel � Gaim)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Afficher les dates dans..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Les con-versations�:"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Pour les messages retard辿s"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Pour les messages retard辿s et dans les salons de discussion"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Les _archives�:"
 
 #. *< type
 #. *< ui_requirement
@@ -1243,20 +1668,86 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Formatage de l'horodatage des messages."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Personnaliser l'affichage de l'horodatage des messages."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Permet � l'utilisateur de personnaliser dans les conversions et les archives "
+"la mani竪re dont est affich辿 l'horodatage."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Opacit辿�:"
+
+#. IM Convo trans options
+#: ../plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Fen棚tres de messages"
+
+#: ../plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "Fen棚tre de _messages transparente"
+
+#: ../plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Afficher la barre de d辿filement dans la fen棚tre"
+
+#: ../plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Supprimer la transparence pour les fen棚tres de messages actives"
+
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Toujours en avant plan"
+
+#. Buddy List trans options
+#: ../plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Fen棚tre de la liste de contacts"
+
+#: ../plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Fen棚tre de la liste de _contacts transparente"
+
+#: ../plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Supprimer la transparence quand la liste des contacts est active"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:660
 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:662
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1266,300 +1757,292 @@
 "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."
-
-#: plugins/win32/winprefs/winprefs.c:385
+"Note�: Ce plugin n辿cessite Windows�2000 ou plus r辿cent."
+
+#: ../plugins/win32/winprefs/winprefs.c:384
 msgid "GTK+ Runtime Version"
 msgstr "Version des biblioth竪ques GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:392
 msgid "Startup"
 msgstr "D辿marrage"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:393
 msgid "_Start Gaim on Windows startup"
 msgstr "_D辿marrer Gaim au lancement de Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:404 ../src/gtkblist.c:3608
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:405
 msgid "_Dockable Buddy List"
 msgstr "Liste de contacts _accrochable"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:409
 msgid "_Keep Buddy List window on top:"
-msgstr "Liste de contacts toujours _visible"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Jamais"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "Absent"
+msgstr "Liste de contacts toujours _visible�:"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:414
 msgid "Only when docked"
-msgstr ""
+msgstr "Seulement quand la fen棚tre est accroch辿e"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:418 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:419
 msgid "_Flash window when messages are received"
 msgstr "_Faire clignoter la fen棚tre sur la r辿ception de messages"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "WinGaim Options"
 msgstr "Pr辿f辿rences de WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:444
 msgid "Options specific to Windows Gaim."
 msgstr "Options sp辿cifiques � Gaim Windows"
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:445
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
 msgstr ""
-
-#: src/account.c:773
-#, fuzzy
+"Fournit des options sp辿cifiques � Gaim Windows, tels que l'accrochage de la "
+"liste de contacts et le clignotement des fen棚tres de conversation."
+
+#: ../src/account.c:773
 msgid "accounts"
 msgstr "Comptes"
 
-#: src/account.c:915
-#, fuzzy
+#: ../src/account.c:923
 msgid "Password is required to sign on."
-msgstr "Le mot de passe a expir辿"
-
-#: src/account.c:940
+msgstr "Un mot de passe est n辿cessaire pour la connexion."
+
+#: ../src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Saisissez le mot de passe pour %s (%s)"
 
-#: src/account.c:947
-#, fuzzy
+#: ../src/account.c:955
 msgid "Enter Password"
-msgstr "Changer de mot de passe"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "Saisissez le mot de passe"
+
+#: ../src/account.c:960
 msgid "Save password"
-msgstr "Nouveau mot de passe"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+msgstr "M辿moriser le mot de passe"
+
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
+#: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
+#: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
+#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/xdata.c:337 ../src/protocols/msn/msn.c:250
+#: ../src/protocols/msn/msn.c:265 ../src/protocols/msn/msn.c:280
+#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2999
+#: ../src/protocols/oscar/oscar.c:4542 ../src/protocols/oscar/oscar.c:4623
+#: ../src/protocols/oscar/oscar.c:8051 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:8199 ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1182
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:749
+#: ../src/protocols/yahoo/yahoo.c:3061 ../src/protocols/yahoo/yahoo.c:3070
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4960
+#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:777
+#: ../src/gtkdialogs.c:796 ../src/gtkdialogs.c:818 ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:882 ../src/gtkdialogs.c:937 ../src/gtkdialogs.c:974
+#: ../src/gtkdialogs.c:999 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
+#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
+#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
+#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
+#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/oscar/oscar.c:3000
+#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
+#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5321
+#: ../src/protocols/sametime/sametime.c:5410
+#: ../src/protocols/sametime/sametime.c:5534 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
+#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:994 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin pour le protocole %s manquant"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3496
 msgid "Connection Error"
 msgstr "Erreur de connexion"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diff竪rent"
 
-#: src/account.c:1061
+#: ../src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "Remplissez tous les champs"
 
-#: src/account.c:1085
+#: ../src/account.c:1108
 msgid "Original password"
 msgstr "Mot de passe courant"
 
-#: src/account.c:1092
+#: ../src/account.c:1115
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/account.c:1099
+#: ../src/account.c:1122
 msgid "New password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/account.c:1105
+#: ../src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "Changer le mot de passe pour %s"
 
-#: src/account.c:1113
+#: ../src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
 
-#: src/account.c:1146
+#: ../src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "Changer les informations pour %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
+#: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: ../src/account.c:1671 ../src/gtkft.c:157
+#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
+#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/blist.c:545
-#, fuzzy
+#: ../src/blist.c:543
 msgid "buddy list"
 msgstr "Liste de contacts"
 
-#: src/blist.c:1162
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "Discussions"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1886
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
-"%d contact du groupe %s ne peut 棚tre supprim辿 uniquement pendant la "
-"connexion au compte correspondant. Le contact et le groupe n'ont pas 辿t辿 "
-"supprim辿s.\n"
+"%d contact du groupe %s n'a pas 辿t辿 supprim辿 parce qu'il est li辿 � un compte "
+"d辿sactiv辿 ou d辿connect辿. Ce contact et le groupe n'ont pas 辿t辿 supprim辿s.\n"
 msgstr[1] ""
-"%d contacts du groupe %s ne peuvent 棚tre supprim辿s uniquement pendant la "
-"connexion aux comptes correspondants. Les contacts et le groupe n'ont pas "
+"%d contacts du groupe %s n'ont pas 辿t辿 supprim辿s parce qu'ils sont li辿s � "
+"des comptes d辿sactiv辿s ou d辿connect辿s. Ces contacts et le groupe n'ont pas "
 "辿t辿 supprim辿s.\n"
 
-#: src/blist.c:1872
+#: ../src/blist.c:1896
 msgid "Group not removed"
 msgstr "Groupe non supprim辿"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "Erreur d'enregistrement"
 
-#: src/conversation.c:205
-#, fuzzy
+#: ../src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s vient de se connecter"
+
+#: ../src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s a quitt辿"
+
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
 msgstr "Impossible d'envoyer le message�: trop gros"
 
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+#: ../src/conversation.c:166 ../src/conversation.c:179
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "Impossible d'envoyer le message vers %s�:"
-
-#: src/conversation.c:209
+msgstr "Impossible d'envoyer le message vers %s."
+
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "Message trop long"
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entr辿 dans le salon"
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entr辿 dans le salon"
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous 棚tes d辿sormais connu sous le nom de %s"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est d辿sormais connu sous le nom de %s"
 
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s a quitt辿 le salon (%s)"
-
-#: src/conversation.c:1671
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitt辿 le salon"
 
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d suppl辿mentaires)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr " a quitt辿 le salon (%s)"
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: ../src/conversation.c:1723
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s a quitt辿 le salon (%s)"
+
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+msgid "No name"
+msgstr "Anonyme"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1568,7 +2051,7 @@
 "Erreur � la lecture de 束�%s�損�:\n"
 "%s\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1577,7 +2060,7 @@
 "Erreur � l'辿criture de 束�%s�損�:\n"
 "%s\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1586,37 +2069,37 @@
 "Erreur lors de l'acc竪s � 束�%s�損�:\n"
 "%s\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "Impossible d'envoyer un fichier de taille nulle"
 
-#: src/ft.c:239
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "Impossible d'envoyer un dossier"
 
-#: src/ft.c:248
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
-"束�%s�損 n'est pas un fichier r辿gulier. Gaim refuse lachement d'辿craser ce "
+"束�%s�損 n'est pas un fichier r辿gulier. Gaim refuse l但chement d'辿craser ce "
 "fichier.\n"
 
-#: src/ft.c:306
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s veut vous envoyer %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s veut vous envoyer un fichier"
 
-#: src/ft.c:354
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accepter la requ棚te de transfert de %s�?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1627,65 +2110,65 @@
 "H担te distant�: %s\n"
 "Port distant�: %d"
 
-#: src/ft.c:382
+#: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s propose de vous envoyer le fichier %s"
 
-#: src/ft.c:422
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s n'est pas un nom de fichier valide\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:463
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Proposition d'envoyer 束�%s�損 � %s"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: ../src/ft.c:474
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Accepter la requ棚te de transfert de %s�?"
-
-#: src/ft.c:608
+msgstr "D辿marrage du transfert de %s depuis %s."
+
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfert du fichier 束�%s�損 termin辿"
 
-#: src/ft.c:611
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "Transfert de fichier termin辿"
 
-#: src/ft.c:995
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vous avez a annul辿 le transfert de 束�%s�損"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annul辿"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s a annul辿 le transfert de 束�%s�損"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s a annul辿 le transfert du fichier"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: ../src/ft.c:1146
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Transfert de fichier vers %s annul辿\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "�chec du transfert vers %s."
+
+#: ../src/ft.c:1148
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Transfert de fichier depuis %s annul辿\n"
-
-#: src/gtkaccount.c:362
+msgstr "�chec du transfert depuis %s."
+
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1697,177 +2180,162 @@
 "<b>Taille de l'image�:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
 msgstr "Protocole�:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Utilisateur�:"
-
-#: src/gtkaccount.c:825
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "Mot de passe�:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4538 ../src/gtkblist.c:4904
 msgid "Alias:"
 msgstr "Alias�:"
 
-#: src/gtkaccount.c:834
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "M辿moriser le mot de passe"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "Ic担ne�:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "Options de %s"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "Utiliser les param竪tres globaux"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "Utiliser les param竪tres globaux"
 
-#: src/gtkaccount.c:1249
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "on peut voir les papillons s'accoupler"
 
-#: src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "Si on regarde de tr竪s pr竪s"
 
-#: src/gtkaccount.c:1269
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "_Type�:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "_H担te�:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_Port�:"
 
-#: src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
 msgstr "_Utilisateur�:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "_Mot de passe�:"
 
-#: src/gtkaccount.c:1700
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1738
 msgid "Modify Account"
 msgstr "Modification du compte"
 
+#: ../src/gtkaccount.c:1760
+msgid "_Basic"
+msgstr "_Basic"
+
+#: ../src/gtkaccount.c:1771
+msgid "_Advanced"
+msgstr "_Avanc辿"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:822
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�tes-vous s短r de vouloir supprimer %s�?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5187
 msgid "Screen Name"
 msgstr "Pseudo"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "�chou辿"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s a fait de %s son contact%s%s%s"
-
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Voulez-vous l'ajouter � votre liste de contacts�?"
-
-#: src/gtkaccount.c:2572
+#: ../src/gtkaccount.c:2586
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s a fait de %s son contact%s%s"
+
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "Ajouter cet utilisateur � la liste de contacts�?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4959 ../src/gtkconv.c:1616
+#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/protocols/sametime/sametime.c:5409 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:678
 msgid "Join a Chat"
 msgstr "Joindre une discussion"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:699
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1875,221 +2343,217 @@
 "Saisissez les informations appropri辿es � propos du salon de discussions que "
 "vous voulez joindre.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:710 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Compte�:"
 
-#: src/gtkblist.c:935
+#: ../src/gtkblist.c:954
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: src/gtkblist.c:938
+#: ../src/gtkblist.c:957 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Message"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:963
 msgid "_Send File"
 msgstr "Envoyer un _fichier"
 
-#: src/gtkblist.c:950
+#: ../src/gtkblist.c:971
+msgid "Start _Voice Chat"
+msgstr "Lancer une discussion _t辿l辿phonique"
+
+#: ../src/gtkblist.c:977
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:981 ../src/gtkblist.c:985 ../src/gtkblist.c:1084
+#: ../src/gtkblist.c:1107
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "Donner un _alias..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Supprimer"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Donner un alias � un contact..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Supprimer contact"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: ../src/gtkblist.c:996
+msgid "Alias..."
+msgstr "Alias..."
+
+#: ../src/gtkblist.c:999 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
+msgid "Remove"
+msgstr "Enlever"
+
+#: ../src/gtkblist.c:1005 ../src/gtkblist.c:1092 ../src/gtkblist.c:1113
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:1007 ../src/gtkblist.c:1094 ../src/gtkblist.c:1115
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1055
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1057
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1060
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1062
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1080 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Joindre"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1082
 msgid "Auto-Join"
 msgstr "Connexion auto"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1120 ../src/gtkblist.c:1143
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1148
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1438 ../src/gtkblist.c:3753
+#: ../src/gtkblist.c:3763
 msgid "/Tools/Mute Sounds"
-msgstr "Silencieux"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+msgstr "/Outils/Silencieux"
+
+#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4203 ../src/gtkpounce.c:426
 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:2329
+#: ../src/gtkblist.c:2475
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: src/gtkblist.c:2330
+#: ../src/gtkblist.c:2476
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2477
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Joindre une discussion..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2478
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: src/gtkblist.c:2333
+#: ../src/gtkblist.c:2479
 msgid "/Buddies/View User _Log..."
-msgstr "/Contacts/Voir les arc_hives..."
-
-#: src/gtkblist.c:2335
+msgstr "/Contacts/Voir les _archives..."
+
+#: ../src/gtkblist.c:2481
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _d辿connect辿s"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2482
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacts/Afficher les groupes _vides"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: ../src/gtkblist.c:2483
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Contacts/Afficher les contacts _d辿connect辿s"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/Contacts/Afficher les contacts _d辿connect辿s"
-
-#: src/gtkblist.c:2340
+msgstr "/Contacts/_Afficher les informations des contacts"
+
+#: ../src/gtkblist.c:2484
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Contacts/Afficher les tem_ps d'inactivit辿"
+
+#: ../src/gtkblist.c:2485
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Contacts/_Trier les contacts"
+
+#: ../src/gtkblist.c:2487
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Contacts/_Ajouter un contact..."
-
-#: src/gtkblist.c:2341
+msgstr "/Contacts/Ajouter un _contact..."
+
+#: ../src/gtkblist.c:2488
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: src/gtkblist.c:2342
+#: ../src/gtkblist.c:2489
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: src/gtkblist.c:2344
+#: ../src/gtkblist.c:2491
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
+#. Accounts menu
+#: ../src/gtkblist.c:2494
+msgid "/_Accounts"
+msgstr "/_Comptes"
+
+#: ../src/gtkblist.c:2495 ../src/gtkblist.c:5538
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Comptes/_Modifier"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2498
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Outils/A_lertes"
-
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Outils/Ac_tions des comptes"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/Outils/_Comptes"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2499
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Outils/_Alertes"
+
+#: ../src/gtkblist.c:2500
+msgid "/Tools/Plu_gins"
+msgstr "/Outils/Plu_gins"
+
+#: ../src/gtkblist.c:2501
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Pr辿f辿rences"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/Outils/Actions des plugins"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2502
 msgid "/Tools/Pr_ivacy"
-msgstr "/Outils/F_iltres"
-
-#: src/gtkblist.c:2355
+msgstr "/Outils/_Filtres"
+
+#: ../src/gtkblist.c:2504
 msgid "/Tools/_File Transfers"
-msgstr "/Outils/Transferts de _fichier"
-
-#: src/gtkblist.c:2356
+msgstr "/Outils/_Transferts de fichier"
+
+#: ../src/gtkblist.c:2505
 msgid "/Tools/R_oom List"
-msgstr "/Outils/Liste des _salons de discussion"
-
-#: src/gtkblist.c:2358
-#, fuzzy
+msgstr "/Outils/_Liste des salons de discussion"
+
+#: ../src/gtkblist.c:2506
+msgid "/Tools/System _Log"
+msgstr "/Outils/Voir les archives s_yst竪me"
+
+#: ../src/gtkblist.c:2508
 msgid "/Tools/Mute _Sounds"
-msgstr "Silencieux"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Outils/Voir les archives _syst竪me"
+msgstr "/Outils/_Silencieux"
 
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2511
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2512
 msgid "/Help/Online _Help"
 msgstr "/Aide/_Aide en ligne"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2513
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fen棚tre de _debug"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2514
 msgid "/Help/_About"
 msgstr "/Aide/_A propos de"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2546 ../src/gtkblist.c:2615
 #, c-format
 msgid ""
 "\n"
@@ -2098,69 +2562,60 @@
 "\n"
 "<b>Compte�:</b> %s"
 
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
+#: ../src/gtkblist.c:2627
+#, c-format
 msgid ""
 "\n"
-"<b>Contact Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>Alias du contact�:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias�:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+"<b>Alias du contact�:</b> %s"
+
+#: ../src/gtkblist.c:2639
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>Pseudonyme�:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+"<b>Pseudonyme�:</b> %s"
+
+#: ../src/gtkblist.c:2648
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>Connexion�:</b>"
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+"<b>Connexion�:</b> %s"
+
+#: ../src/gtkblist.c:2659
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>Inactif�:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
+"<b>Inactif�:</b> %s"
+
+#: ../src/gtkblist.c:2694
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s�:</b> %s"
-
-#: src/gtkblist.c:2554
+"<b>Vu r辿cemment�:</b> il y a %s"
+
+#: ../src/gtkblist.c:2703
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
 msgstr ""
 "\n"
-"<b>Status�:</b> D辿connect辿"
-
-#: src/gtkblist.c:2577
+"<b>�tat�:</b> D辿connect辿"
+
+#: ../src/gtkblist.c:2714
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2168,129 +2623,133 @@
 "\n"
 "<b>Description�:</b> Bizarre"
 
-#: src/gtkblist.c:2579
-#, fuzzy
+#: ../src/gtkblist.c:2716
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>Status�:</b> Fabuleux"
-
-#: src/gtkblist.c:2581
-#, fuzzy
+"<b>�tat�:</b> Fabuleux"
+
+#: ../src/gtkblist.c:2718
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>Status�:</b> G辿nial"
-
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Inactif (%dh%02dm) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Inactif (%dm) "
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
+"<b>�tat�:</b> G辿nial"
+
+#: ../src/gtkblist.c:3007
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inactif %dh %02dm"
+
+#: ../src/gtkblist.c:3009
+#, c-format
+msgid "Idle %dm"
+msgstr "Inactif %dm"
+
+#. Idle stuff
+#: ../src/gtkblist.c:3012 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5208 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
 msgstr "Inactif"
 
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "D辿connect辿 "
-
-#: src/gtkblist.c:2968
-#, fuzzy
+#: ../src/gtkblist.c:3144
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+#: ../src/gtkblist.c:3145 ../src/gtkblist.c:3178
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Joindre une discussion..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: ../src/gtkblist.c:3146
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: src/gtkblist.c:2971
-#, fuzzy
+#: ../src/gtkblist.c:3147
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacts/_Ajouter un contact..."
 
-#: src/gtkblist.c:2972
-#, fuzzy
+#: ../src/gtkblist.c:3148 ../src/gtkblist.c:3181
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: src/gtkblist.c:2973
-#, fuzzy
+#: ../src/gtkblist.c:3149
 msgid "/Buddies/Add Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: src/gtkblist.c:3006
+#: ../src/gtkblist.c:3184
+msgid "/Tools/Buddy Pounces"
+msgstr "/Outils/Alertes"
+
+#: ../src/gtkblist.c:3187
+msgid "/Tools/Privacy"
+msgstr "/Outils/Filtres"
+
+#: ../src/gtkblist.c:3190
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons"
 
-#: src/gtkblist.c:3009
-msgid "/Tools/Privacy"
-msgstr "/Outils/Filtres"
-
-#: src/gtkblist.c:3085
-#, fuzzy
+#: ../src/gtkblist.c:3384
 msgid "Manually"
 msgstr "Manuel"
 
-#: src/gtkblist.c:3087
-#, fuzzy
+#: ../src/gtkblist.c:3386
 msgid "Alphabetically"
 msgstr "Alphab辿tique"
 
-#: src/gtkblist.c:3088
+#: ../src/gtkblist.c:3387
 msgid "By status"
 msgstr "Par 辿tat"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3388
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Outils/Alertes"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Outils/Actions du compte"
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191
+#, c-format
+msgid "%s disconnected"
+msgstr "D辿connexion de %s"
+
+#: ../src/gtkblist.c:3515
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s d辿connect辿�: %s</span>"
+
+#: ../src/gtkblist.c:3642
+msgid "/Accounts"
+msgstr "/Comptes"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3747
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _d辿connect辿s"
 
-#: src/gtkblist.c:3324
+#: ../src/gtkblist.c:3750
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacts/Ajouter les groupes vides"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: ../src/gtkblist.c:3756
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Contacts/Afficher les contacts _d辿connect辿s"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/Contacts/Afficher les informations des contacts"
+
+#: ../src/gtkblist.c:3759
+msgid "/Buddies/Show Idle Times"
+msgstr "/Contacts/Afficher les temps d'inactivit辿"
+
+#: ../src/gtkblist.c:4471 ../src/protocols/silc/buddy.c:736
+#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2976
 msgid "Add Buddy"
 msgstr "Nouveau contact"
 
-#: src/gtkblist.c:4029
+#: ../src/gtkblist.c:4495
 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. "
@@ -2300,16 +2759,20 @@
 "contacts. Vous pouvez choisir un alias ou surnom pour le contact. L'alias "
 "sera affich辿 � la place du pseudo chaque fois que cela est possible.\n"
 
+#: ../src/gtkblist.c:4517
+msgid "Screen Name:"
+msgstr "Utilisateur�:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4565 ../src/gtkblist.c:4884
 msgid "Account:"
 msgstr "Compte�:"
 
-#: src/gtkblist.c:4357
+#: ../src/gtkblist.c:4817
 msgid "This protocol does not support chat rooms."
 msgstr "Les salons de discussions ne sont pas support辿s par ce protocole."
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4833
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2317,11 +2780,11 @@
 "Vous n'avez pas de protocole disponible vous permettant de joindre des "
 "groupes de discussion."
 
-#: src/gtkblist.c:4390
+#: ../src/gtkblist.c:4850
 msgid "Add Chat"
 msgstr "Ajouter discussion"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4874
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2329,49 +2792,141 @@
 "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:4493
+#: ../src/gtkblist.c:4956 ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5407
 msgid "Add Group"
 msgstr "Nouveau groupe"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:4957
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe � ajouter"
 
-#: src/gtkblist.c:5025
+#: ../src/gtkblist.c:5578
+msgid "_Edit Account"
+msgstr "Modifier le _compte"
+
+#: ../src/gtkblist.c:5611 ../src/gtkblist.c:5617
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: ../src/gtkblist.c:5625
+msgid "_Disable"
+msgstr "_D辿sactiv辿"
+
+#: ../src/gtkblist.c:5637
+msgid "Enable Account"
+msgstr "Activer le compte"
+
+#: ../src/gtkblist.c:5690
 msgid "/Tools"
-msgstr "/_Outils"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "D辿connect辿"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
+msgstr "/Outils"
+
+#: ../src/gtkblist.c:5785
+msgid "/Buddies/Sort Buddies"
+msgstr "/Contacts/Trier les contacts"
+
+#: ../src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "Nom de la couleur de fond"
+
+#: ../src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "Couleur de fond en cha樽ne de caract竪res"
+
+#: ../src/gtkcellview.c:205 ../src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "Couleur de fond"
+
+#: ../src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "Couleur de fond en tant que GdkColor"
+
+#: ../src/gtkcellview.c:213
+msgid "Background set"
+msgstr "Changement de couleur de fond"
+
+#: ../src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "Indique si cet 辿l辿ment modifie la couleur de fond"
+
+#: ../src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr "Mod竪le ComboBox"
+
+#: ../src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr "Mod竪le utilis辿 par les objets de type liste d辿roulante"
+
+#: ../src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr "Retour � la ligne"
+
+#: ../src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr ""
+"Les 辿l辿ments dans un grille seront automatiquement d辿plac辿 sur une nouvelle "
+"ligne"
+
+#: ../src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "Colonne pour les lignes 辿tendues"
+
+#: ../src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr ""
+"Colonne de l'objet TreeModel contenant les valeurs d'extension des lignes"
+
+#: ../src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr "Colonne pour les colonnes 辿tendues"
+
+#: ../src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr ""
+"Colonne de l'objet TreeModel contenant les valeurs d'extension des colonnes"
+
+#: ../src/gtkcombobox.c:529
+msgid "Active item"
+msgstr "�l辿ment actif"
+
+#: ../src/gtkcombobox.c:530
+msgid "The item which is currently active"
+msgstr "�l辿ment actif en cours"
+
+#: ../src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "Affich辿 en tant que liste"
+
+#: ../src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr ""
+"Indique si la liste d辿roulante doit appara樽tre comme une liste ou un menu"
+
+#: ../src/gtkconn.c:192
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+"La d辿connexion de %s est due � une erreur�: %s\n"
+"Gaim n'essaiera pas de se reconnecter avec ce compte tant que cette erreur "
+"ne sera pas corrig辿e et que vous ne r辿activiez pas le compte. "
+
+#: ../src/gtkconv.c:364
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me utilise Gaim v%s."
 
-#: src/gtkconv.c:334
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "Les options de debuggage support辿es sont�: version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2380,50 +2935,48 @@
 "sp辿cifique.\n"
 "Les commandes actuellement disponibles sont�:\n"
 
-#: src/gtkconv.c:446
+#: ../src/gtkconv.c:484
 msgid "No such command."
 msgstr "Cette commande n'existe pas."
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Erreur de syntaxe�: mauvais nombre d叩rguments pour cette commande."
-
-#: src/gtkconv.c:458
+msgstr "Erreur de syntaxe�: mauvais nombre d'arguments pour cette commande."
+
+#: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
 msgstr "La commande a 辿chou辿 pour une raison inconnue."
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: ../src/gtkconv.c:503
 msgid "That command only works in chats, not IMs."
 msgstr ""
 "Cette commande fonctionne uniquement dans les discussions, pas les messages."
 
-#: src/gtkconv.c:468
-#, fuzzy
+#: ../src/gtkconv.c:506
 msgid "That command only works in IMs, not chats."
 msgstr ""
 "Cette commande fonctionne uniquement dans les messages, pas les discussions."
 
-#: src/gtkconv.c:472
+#: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Cette commande ne fonctionne pas avec ce protocole."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Ce contact n'utilise pas le m棚me protocole que ce salon de discussion."
-
-#: src/gtkconv.c:719
+msgstr ""
+"Ce contact n'utilise pas le m棚me protocole que ce salon de discussions."
+
+#: ../src/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Vous n'棚tes connect辿 � aucun compte permettant d'inviter ce contact."
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2431,298 +2984,302 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message optionnel d'invitation."
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Contact�:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "_Message�:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Impossible d'ouvrir le fichier"
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Chercher"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Chercher�: "
 
-#: src/gtkconv.c:1227
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-
-#: src/gtkconv.c:1235
+"Archives d辿marr辿es. Les nouveaux messages de cette conversation seront "
+"archiv辿s."
+
+#: ../src/gtkconv.c:1298
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-
-#: src/gtkconv.c:1489
+"Archives arr棚t辿es. Les nouveaux messages de cette conversation ne seront pas "
+"archiv辿s."
+
+#: ../src/gtkconv.c:1578
 msgid "IM"
 msgstr "Message"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1591
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1594
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1600
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1517
-#, fuzzy
+#: ../src/gtkconv.c:1606
 msgid "Get Away Message"
-msgstr "Nouveau message d'absence"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Enlever"
-
-#: src/gtkconv.c:2236
+msgstr "R辿cup辿rer le message d'absence"
+
+#: ../src/gtkconv.c:1621
+msgid "Last said"
+msgstr "Derni竪res paroles"
+
+#: ../src/gtkconv.c:2407
 msgid "Unable to save icon file to disk."
 msgstr "Impossible de sauver l'ic担ne sur le disque"
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "Enregistrer l'ic担ne"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2479
 msgid "Animate"
 msgstr "Animer"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Cacher l'ic担ne"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Enregistrer l'ic担ne sous..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2631
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2638
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/Conversation/Effacer"
-
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2643
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Conversation/_Effacer la conversation"
+
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2648
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2650
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2652
 msgid "/Conversation/In_vite..."
-msgstr "/Conversation/Inviter..."
-
-#: src/gtkconv.c:2393
+msgstr "/Conversation/In_viter..."
+
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/_Donner un alias..."
 
-#: src/gtkconv.c:2395
+#: ../src/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Ins辿rer un _lien..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Ins辿rer une _image..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: ../src/gtkconv.c:2682
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Options/Afficher les _ic担nes des contacts"
+
+#: ../src/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Afficher la _barre de style"
 
-#: src/gtkconv.c:2419
+#: ../src/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Afficher les _ic担nes des contacts"
-
-#: src/gtkconv.c:2460
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2783
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Ins辿rer un _lien..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2825
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Ins辿rer une _image..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2831
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2834
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Afficher la barre de style"
 
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2850
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
-#: src/gtkconv.c:2526
-#, fuzzy
+#: ../src/gtkconv.c:2853
 msgid "/Options/Show Buddy Icon"
-msgstr "Afficher les _ic担nes des contacts"
-
-#: src/gtkconv.c:2597
+msgstr "/Options/Afficher les ic担nes des contacts"
+
+#: ../src/gtkconv.c:2933
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'辿crire..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: ../src/gtkconv.c:2936
+msgid "User has typed something and stopped"
 msgstr "L'utilisateur a 辿crit quelque chose et s'est arr棚t辿"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: ../src/gtkconv.c:3119
 msgid "_Send To"
-msgstr "_Envoyer en tant que"
-
-#: src/gtkconv.c:3373
+msgstr "_Envoyer vers"
+
+#: ../src/gtkconv.c:3771
+msgid "_Send"
+msgstr "_Envoyer"
+
+#: ../src/gtkconv.c:3824 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "Sujet�:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "Envoyer un message � cet utilisateur"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "Ignorer cet utilisateur"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "Voir les informations de l'interlocuteur"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4942 ../src/gtkconv.c:5051
 #, 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:5582
+#: ../src/gtkconv.c:6521
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2730,12 +3287,12 @@
 "say &lt;message&gt;�: Envoyer un message comme si les commandes 辿taient "
 "d辿sactiv辿es."
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6524
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt;�: Envoyer une action � la IRC � un contact ou discussion."
 
-#: src/gtkconv.c:5588
+#: ../src/gtkconv.c:6527
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2743,412 +3300,432 @@
 "debug &lt;option&gt;�: Mettre en place des options de debogage dans la "
 "conversation courante."
 
-#: src/gtkconv.c:5591
+#: ../src/gtkconv.c:6530
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear�: Efface le contenu de la fen棚tre de dialogue."
 
-#: src/gtkconv.c:5594
+#: ../src/gtkconv.c:6533
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;commande&gt;�: Demander de l'aide sur une commande particuli竪re."
 
-#: src/gtkconv.c:5709
-#, fuzzy
+#: ../src/gtkconv.c:6692
 msgid "Confirm close"
-msgstr "Confirmer le compte"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "Confirmer la fermeture"
+
+#: ../src/gtkconv.c:6724
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "�tes-vous s短r de vouloir supprimer %s�?"
-
-#: src/gtkconv.c:6408
+msgstr ""
+"Vous n'avez pas lu certains messages. �tes-vous s短r de vouloir fermer la "
+"fen棚tre�?"
+
+#: ../src/gtkconv.c:7528
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:7992
 msgid "Last created window"
 msgstr "Derni竪re fen棚tre ouverte"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:7994
 msgid "Separate IM and Chat windows"
 msgstr "S辿parer les messages et les discussions"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:7996 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Nouvelle fen棚tre"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:7998
 msgid "By group"
 msgstr "Par groupe"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:8000
 msgid "By account"
 msgstr "Par compte"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Enregistrer les archives de debogage"
 
-#: src/gtkdebug.c:586
-#, fuzzy
+#: ../src/gtkdebug.c:586
 msgid "Invert"
-msgstr "_Ins辿rer"
-
-#: src/gtkdebug.c:589
+msgstr "Inverser"
+
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:636
+msgstr "Surligner les occurrences"
+
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Fen棚tre de debug"
 
-#: src/gtkdebug.c:689
-#, fuzzy
+#: ../src/gtkdebug.c:689
 msgid "Clear"
-msgstr "Fermer"
-
-#: src/gtkdebug.c:698
+msgstr "Effacer"
+
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Horodatage"
 
-#: src/gtkdebug.c:724
-#, fuzzy
+#: ../src/gtkdebug.c:724
 msgid "Filter"
-msgstr "�chou辿"
-
-#: src/gtkdebug.c:743
-#, fuzzy
+msgstr "Filtre"
+
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "Afficher plus d'options"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "Clic droit pour afficher plus d'options."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "codeur principal"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74
 msgid "developer"
 msgstr "codeur"
 
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "codeur et webmestre"
-
-#: src/gtkdialogs.c:62
+#: ../src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "portage win32"
 
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:66
+msgid "developer & webmaster"
+msgstr "codeur et webmestre"
+
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "mainteneur"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: ../src/gtkdialogs.c:96
 msgid "libfaim maintainer"
-msgstr "ancien mainteneur de libfaim"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
+msgstr "mainteneur de libfaim"
+
+#: ../src/gtkdialogs.c:97
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker et conducteur d辿sign辿"
+
+#: ../src/gtkdialogs.c:98
 msgid "Jabber developer"
-msgstr "ancien codeur Jabber"
-
-#: src/gtkdialogs.c:93
+msgstr "codeur Jabber"
+
+#: ../src/gtkdialogs.c:99
 msgid "original author"
 msgstr "auteur original"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker et conducteur d辿sign辿"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../src/gtkdialogs.c:110
 msgid "Bosnian"
-msgstr "Estonien"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "Bosnien"
+
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161
 msgid "Czech"
 msgstr "Tch竪que"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:113
 msgid "Danish"
 msgstr "Danois"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162
 msgid "German"
 msgstr "Allemand"
 
-#: src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+msgid "Greek"
+msgstr "Grec"
+
+#: ../src/gtkdialogs.c:117
 msgid "Australian English"
 msgstr "Anglais australien"
 
-#: src/gtkdialogs.c:107
+#: ../src/gtkdialogs.c:118
+msgid "Canadian English"
+msgstr "Anglais canadien"
+
+#: ../src/gtkdialogs.c:119
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr "Anglais canadien"
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Finnish"
 msgstr "Finnois"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "French"
 msgstr "Fran巽ais"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:123
 msgid "Hebrew"
 msgstr "H辿breu"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:124
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:125
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173
 msgid "Italian"
 msgstr "Italien"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Lituanien"
-
-#: src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177
 msgid "Georgian"
 msgstr "G辿orgien"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178
 msgid "Korean"
 msgstr "Cor辿en"
 
-#: src/gtkdialogs.c:120
-#, fuzzy
+#: ../src/gtkdialogs.c:130
+msgid "Kurdish"
+msgstr "Kurde"
+
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: ../src/gtkdialogs.c:132
+msgid "Macedonian"
+msgstr "Mac辿donien"
+
+#: ../src/gtkdialogs.c:133
 msgid "Dutch, Flemish"
 msgstr "Hollandais, flamand"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "Mac辿donien"
-
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:134
 msgid "Norwegian"
 msgstr "Norv辿gien"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
 msgid "Polish"
 msgstr "Polonais"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:137
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:138
 msgid "Portuguese-Brazil"
 msgstr "Portugais br辿silien"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:139
 msgid "Romanian"
 msgstr "Roumain"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Russian"
 msgstr "Russe"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142
 msgid "Serbian"
 msgstr "Serbe"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:143
 msgid "Slovenian"
 msgstr "Slov竪ne"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184
 msgid "Swedish"
 msgstr "Su辿dois"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:145
+msgid "Tamil"
+msgstr "Tamoul"
+
+#: ../src/gtkdialogs.c:146
 msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:134
+msgstr "T辿lougou"
+
+#: ../src/gtkdialogs.c:147
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../src/gtkdialogs.c:148
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:148
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh et l'辿quipe Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185
 msgid "Simplified Chinese"
 msgstr "Chinois simplifi辿"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:157
 msgid "Amharic"
 msgstr "Amharique"
 
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:183
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:227
 msgid "About Gaim"
 msgstr "� propos de Gaim"
 
-#: src/gtkdialogs.c:226
-#, fuzzy
+#: ../src/gtkdialogs.c:251
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim est un client de messagerie instantan辿e compatible avec AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr et Gadu-"
-"Gadu. Il est 辿crit en Gtk+ et est distribu辿 sous licence GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr ""
+"Gaim est un client de messagerie modulaire compatible avec AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr et "
+"Gadu-Gadu. Il est 辿crit avec Gtk+. <BR><BR>Vous pouvez modifier et "
+"redistribuer ce programme sous les conditions 辿nonc辿es par la licence GNU "
+"GPL (version 2 ou ult辿rieure). Une copie de la licence GPL est dans le "
+"fichier 束�COPYING�損 fourni avec Gaim. Gaim est sous le droit d'auteur de ses "
+"collaborateurs. Aucune garantie n'est fournie pour l'utilisation de ce "
+"programme.<BR><BR>"
+
+#: ../src/gtkdialogs.c:265
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC�:</FONT> #wingaim et #gaim-fr sur irc.freenode."
-"net<BR><BR>"
-
-#: src/gtkdialogs.c:238
+msgstr "<FONT SIZE=\"4\">IRC�:</FONT> #wingaim sur irc.freenode.net<BR><BR>"
+
+#: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC�:</FONT> #gaim et #gaim-fr sur irc.freenode.net<BR><BR>"
-
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Codeurs actifs"
-
-#: src/gtkdialogs.c:259
+msgstr "<FONT SIZE=\"4\">IRC�:</FONT> #gaim sur irc.freenode.net<BR><BR>"
+
+#: ../src/gtkdialogs.c:274
+msgid "Current Developers"
+msgstr "Codeurs"
+
+#: ../src/gtkdialogs.c:289
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:304
 msgid "Retired Developers"
 msgstr "Codeurs retrait辿s"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:319
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:339
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: ../src/gtkdialogs.c:357
 msgid "Debugging Information"
-msgstr "Informations"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "Informations de debug"
+
+#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
 msgid "_Name"
-msgstr "Nom"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "_Nom"
+
+#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
 msgid "_Account"
 msgstr "_Compte"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:566
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
+#: ../src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Saisissez le pseudo du destinataire pour le message"
-
-#: src/gtkdialogs.c:643
+msgstr "Saisissez le pseudonyme ou l'alias du destinataire pour le message."
+
+#: ../src/gtkdialogs.c:703
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: src/gtkdialogs.c:645
-#, fuzzy
+#: ../src/gtkdialogs.c:705
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les informations"
-
-#: src/gtkdialogs.c:699
-#, fuzzy
+msgstr ""
+"Saisissez le pseudonyme ou l'alias de l'utilisateur dont vous voulez les "
+"informations."
+
+#: ../src/gtkdialogs.c:771
 msgid "View User Log"
-msgstr "Archives utilisateur"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
+msgstr "Voir les archives d'un contact"
+
+#: ../src/gtkdialogs.c:773
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les archives"
-
-#: src/gtkdialogs.c:720
+msgstr ""
+"Saisissez le pseudonyme ou l'alias de l'utilisateur dont vous voulez les "
+"archives."
+
+#: ../src/gtkdialogs.c:792
 msgid "Alias Contact"
 msgstr "Donner un alias � un contact"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:793
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:795 ../src/gtkdialogs.c:817 ../src/gtkdialogs.c:837
+#: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:813
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:815
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:834
 msgid "Alias Chat"
 msgstr "Donner un alias � un groupe de discussion"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:835
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: src/gtkdialogs.c:800
-#, fuzzy, c-format
+#: ../src/gtkdialogs.c:872
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -3156,13 +3733,21 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Vous allez supprimer le contact contenant %s et %d autres identifiants votre "
-"liste de contacts. Voulez-vous continuer�?"
+"Vous allez supprimer le contact contenant %s et %d autre identifiant de "
+"votre liste de contacts. Voulez-vous continuer�?"
 msgstr[1] ""
-"Vous allez supprimer le contact contenant %s et %d autres identifiants votre "
-"liste de contacts. Voulez-vous continuer�?"
-
-#: src/gtkdialogs.c:867
+"Vous allez supprimer le contact contenant %s et %d autres identifiants de "
+"votre liste de contacts. Voulez-vous continuer�?"
+
+#: ../src/gtkdialogs.c:880
+msgid "Remove Contact"
+msgstr "Supprimer contact"
+
+#: ../src/gtkdialogs.c:881
+msgid "_Remove Contact"
+msgstr "_Supprimer contact"
+
+#: ../src/gtkdialogs.c:932
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3171,22 +3756,30 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer�?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:935
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:936
+msgid "_Remove Group"
+msgstr "_Supprimer un groupe"
+
+#: ../src/gtkdialogs.c:969
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer�?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:972
 msgid "Remove Buddy"
 msgstr "Supprimer ce contact"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:973
+msgid "_Remove Buddy"
+msgstr "_Supprimer"
+
+#: ../src/gtkdialogs.c:994
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3195,170 +3788,175 @@
 "Vous allez supprimer le groupe de discussion %s de votre liste de contacts. "
 "Voulez-vous continuer�?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "Enlever discussion"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:998
+msgid "_Remove Chat"
+msgstr "_Supprimer un salon de discussions"
+
+#: ../src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f Ko/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Fini"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Annul辿"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "En attente de d辿but de transfert"
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>R辿ception vers�:</b>"
 
-#: src/gtkft.c:220
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>R辿ception depuis�:</b>"
 
-#: src/gtkft.c:224
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Envoi vers�:</b>"
 
-#: src/gtkft.c:226
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Envoi depuis�:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:443
 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:447
+#: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
+#: ../src/gtkft.c:485
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "Erreur au lancement de <b>%s</b>�: %s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "Erreur au lancement de %s�: %s"
+
+#: ../src/gtkft.c:494
+#, c-format
 msgid "Error running %s"
-msgstr "Erreur lors de l'arriv辿e dans la discussion %s"
-
-#: src/gtkft.c:477
+msgstr "Erreur � l'ex辿cution de %s"
+
+#: ../src/gtkft.c:495
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "Le processus a renvoy辿 le code d'erreur %d"
+
+#: ../src/gtkft.c:589
 msgid "Progress"
 msgstr "�tat"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:596
 msgid "Filename"
 msgstr "Fichier"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:603
 msgid "Size"
 msgstr "Taille"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:610
 msgid "Remaining"
 msgstr "Reste"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:641
 msgid "Filename:"
 msgstr "Fichier�:"
 
-#: src/gtkft.c:625
+#: ../src/gtkft.c:642
 msgid "Local File:"
 msgstr "Fichier local�:"
 
-#: src/gtkft.c:626
+#: ../src/gtkft.c:643
 msgid "Status:"
-msgstr "Status�:"
-
-#: src/gtkft.c:627
+msgstr "�tat�:"
+
+#: ../src/gtkft.c:644
 msgid "Speed:"
 msgstr "Vitesse�:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:645
 msgid "Time Elapsed:"
 msgstr "Temps 辿coul辿�:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:646
 msgid "Time Remaining:"
 msgstr "Temps restant�:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Garder la fen棚tre ouverte"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8546
+msgid "File Transfers"
+msgstr "Transferts de fichier"
+
+#: ../src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "Fermer cette fen棚tre quand tous les transferts sont _termin辿s."
+
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Effacer les transferts termin辿s"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "Cacher les d辿tails du transfert"
+msgstr "_D辿tails du transfert"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005
 msgid "Failed"
-msgstr "�chou辿"
-
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Coller comme _texte"
-
-#: src/gtkimhtml.c:1313
+msgstr "�chec"
+
+#: ../src/gtkimhtml.c:818
+msgid "Paste as Plain _Text"
+msgstr "Coller comme _texte seulement"
+
+#: ../src/gtkimhtml.c:1316
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1317
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: src/gtkimhtml.c:1317
-#, fuzzy
+#: ../src/gtkimhtml.c:1320
 msgid "Hyperlink prelight color"
-msgstr "Couleur des liens hypertextes"
-
-#: src/gtkimhtml.c:1318
-#, fuzzy
+msgstr "Couleur de surlignage des liens hypertextes"
+
+#: ../src/gtkimhtml.c:1321
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Couleur pour afficher les liens hypertextes"
-
-#: src/gtkimhtml.c:1537
+msgstr ""
+"Couleur pour afficher les liens hypertextes quand la souris les survole."
+
+#: ../src/gtkimhtml.c:1542
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse 辿lectronique"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1554
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1564
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3261
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3368,7 +3966,7 @@
 "\n"
 "PNG choisi par d辿faut"
 
-#: src/gtkimhtml.c:3237
+#: ../src/gtkimhtml.c:3264
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3378,7 +3976,7 @@
 "\n"
 "Le type PNG est utilis辿 par d辿faut."
 
-#: src/gtkimhtml.c:3250
+#: ../src/gtkimhtml.c:3277
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3389,7 +3987,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: ../src/gtkimhtml.c:3280
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3400,35 +3998,35 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3400
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3436,141 +4034,145 @@
 "Saisissez l'URL et la description du lien � inclure. La description est "
 "facultative."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Saisissez l'URL du lien � inclure."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Ins辿rer un lien"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Ins辿rer"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image�: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Ins辿rer une image"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Ce th竪me n'a pas de frimousses"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Souriez�!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "Gras"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "Italique"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "Soulign辿"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "Police plus grande"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "Police plus petite"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "Police"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "Couleur du texte"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Couleur de fond"
-
-#: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
+#: ../src/gtkimhtmltoolbar.c:1030
 msgid "Clear formatting"
-msgstr "_Effacer le style"
-
-#: src/gtkimhtmltoolbar.c:1038
+msgstr "Effacer le style"
+
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Ins辿rer un lien"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "Ins辿rer une image"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "Ins辿rer une frimousse"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Conversations avec %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Conversations avec %s"
-
-#: src/gtklog.c:309
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Conversation dans %s le %s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Conversation avec %s le %s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-
-#: src/gtklog.c:313
+"Les 辿v竪nements syst竪me ne seront archiv辿s que si l'option 束�Archiver tous "
+"les changements d'辿tat dans les archives syst竪me�損 est activ辿e."
+
+#: ../src/gtklog.c:315
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+"Les messages individuels ne seront archiv辿s que si l'option 束�Archiver tous "
+"les messages�損 est activ辿e."
+
+#: ../src/gtklog.c:318
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Les discussions en salon ne seront archiv辿es que si l'option 束�Archiver "
+"toutes les discussions�損 est activ辿e."
+
+#: ../src/gtklog.c:322
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "Aucune archive n'a 辿t辿 trouv辿e."
+
+#: ../src/gtklog.c:398
 msgid "Total log size:"
-msgstr "Par la taille des archives"
-
-#: src/gtklog.c:472
-#, fuzzy, c-format
+msgstr "Taille totale des archives�:"
+
+#: ../src/gtklog.c:474
+#, c-format
 msgid "Conversations in %s"
-msgstr "Conversations avec %s"
-
-#: src/gtklog.c:480 src/gtklog.c:531
+msgstr "Conversations dans %s"
+
+#: ../src/gtklog.c:482 ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations avec %s"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:558
 msgid "System Log"
-msgstr "Journal du syst棚me"
-
-#: src/gtkmain.c:326
+msgstr "Archives des messages syst竪me"
+
+#: ../src/gtkmain.c:312
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. 束�%s -h�損 pour plus d'informations.\n"
 
-#: src/gtkmain.c:328
+#: ../src/gtkmain.c:314
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3584,46 +4186,123 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "Navigateur de Gnome"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+"Gaim %s\n"
+"Usage : %s [options] ...\n"
+"\n"
+"  -c, --config=DIR    lit les fichiers de configuration depuis le dossier "
+"DIR\n"
+"  -d, --debug         affiche les messages de debug  sur la sortie standard\n"
+"  -h, --help          affiche ce texte d'aide\n"
+"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
+"  -l, --login[=NAME]  connexion automatique au lancement (l'argument NAME\n"
+"                      facultatif indique les comptes � utiliser, s辿par辿s "
+"par\n"
+"                      des virgules)\n"
+"  -v, --version       affiche le num辿ro de la version actuelle\n"
+
+#: ../src/gtkmain.c:497
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"Gaim a plant辿 et a essay辿 de cr辿er un fichier \"core\".\n"
+"Ceci est un probl竪me logiciel et n'est pas d短 � une\n"
+"utilisation erron辿e du logiciel de votre part.\n"
+"\n"
+"Si vous pouvez reproduire ce plantage, veuillez en\n"
+"informer les d辿veloppeurs en rapportant le probl竪me sur\n"
+"%sbug.php\n"
+"\n"
+"Veuillez bien pr辿ciser ce que vous faisiez � cet instant et\n"
+"attacher la pile d'appel (backtrace) obtenue depuis le fichier\n"
+"core. Si vous ne savez pas comment proc辿der, veuillez suivre\n"
+"les indications sur\n"
+"%sgdb.php\n"
+"Si vous avez besoin d'une aide suppl辿mentaire, veuillez joindre\n"
+"par AIM SeanEgn ou LSchiere (en anglais). Les informations pour\n"
+"contacter Sean ou Luke en utilisant un autre protocole sont\n"
+"disponibles sur\n"
+"%scontactinfo.php\n"
+
+#: ../src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "Fin de l'appel."
+
+#: ../src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "Appel de %s"
+
+#: ../src/gtkmedia.c:73 ../src/gtkmedia.c:108
+msgid "End Call"
+msgstr "Fin d'appel"
+
+#: ../src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "R辿ception d'appel de %s"
+
+#: ../src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "Refuser l'appel"
+
+#: ../src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "Accepter l'appel"
+
+#: ../src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "Connect辿 � %s"
+
+#: ../src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "_Silencieux"
+
+#: ../src/gtknotify.c:305
+msgid "New Mail"
+msgstr "Nouveau courriel"
+
+#: ../src/gtknotify.c:321
+msgid "Open All Messages"
+msgstr "Ouvrir tous les messages"
+
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1115
+msgid "From"
+msgstr "Source"
+
+#: ../src/gtknotify.c:390
+msgid "Subject"
+msgstr "Sujet"
+
+#: ../src/gtknotify.c:399
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier�!</span>"
+
+#: ../src/gtknotify.c:451
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s a re巽u %d nouveau message"
-msgstr[1] "%s a re巽u %d nouveaux messages"
-
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">De�:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Sujet�:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Vous avez du courrier�!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+msgstr[0] "%s a re巽u %d nouveau message."
+msgstr[1] "%s a re巽u %d nouveaux messages."
+
+#: ../src/gtknotify.c:456
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3634,195 +4313,270 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5460
 msgid "Search Results"
 msgstr "R辿sultats de la recherche"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "Info for %s"
 msgstr "Informations pour %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informations sur le contact"
 
-#: src/gtknotify.c:687
+#: ../src/gtknotify.c:840
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "La commande <b>%s</b> pour le navigateur est non valide."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
+#: ../src/gtknotify.c:992
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Erreur au lancement de <b>%s</b>�: %s"
 
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:993
 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:130
+#: ../src/gtkplugin.c:275
+msgid "The following plugins will be unloaded."
+msgstr "Les plugins suivants vont 棚tre d辿charg辿s."
+
+#: ../src/gtkplugin.c:294
+msgid "Multiple plugins will be unloaded."
+msgstr "Plusieurs plugins vont 棚tre d辿charg辿s."
+
+#: ../src/gtkplugin.c:296
+msgid "Unload Plugins"
+msgstr "D辿chargement de plugins"
+
+#: ../src/gtkplugin.c:410
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Auteur�:</span> %s\n"
+"<span weight=\"bold\">Page web�:</span> %s\n"
+"<span weight=\"bold\">Fichier�:</span> %s"
+
+#: ../src/gtkplugin.c:420
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Erreur�: %s\n"
+"Consultez le site web du plugin pour une mise � jour 辿ventuelle.</span>"
+
+#: ../src/gtkplugin.c:546
+msgid "Configure Pl_ugin"
+msgstr "Configurer le _plugin"
+
+#: ../src/gtkplugin.c:604
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Informations sur le plugin</b>"
+
+#: ../src/gtkpounce.c:162
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la cr辿ation d'une alerte"
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "�diter une alerte"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
-msgstr "Contact d辿clencheur"
-
-#: src/gtkpounce.c:435
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:520
+msgid "Pounce on Whom"
+msgstr "Alerte sur"
+
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "_Contact�:"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "�v辿nements d辿clencheurs"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "_Connexion"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "D辿conne_xion"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Absent"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "_Retour d'absence"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Inactif"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Re_tour d'inactivit辿"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "Le contact commence � 辿cr_ire"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "Le contact s'arr棚te d'辿crir_e"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "Action de l'alerte"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "Ouvrir une _fen棚tre de message"
-
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:571
+msgid "Pounce When Buddy..."
+msgstr "D辿clenchement quand le contact..."
+
+#: ../src/gtkpounce.c:579
+msgid "Si_gns on"
+msgstr "Se _connecte"
+
+#: ../src/gtkpounce.c:581
+msgid "Signs o_ff"
+msgstr "Se _d辿connecte"
+
+#: ../src/gtkpounce.c:583
+msgid "Goes a_way"
+msgstr "S'_absente"
+
+#: ../src/gtkpounce.c:585
+msgid "Ret_urns from away"
+msgstr "_Revient d'absence"
+
+#: ../src/gtkpounce.c:587
+msgid "Becomes _idle"
+msgstr "Devient _inactif"
+
+#: ../src/gtkpounce.c:589
+msgid "Is no longer i_dle"
+msgstr "N'est plus i_nactif"
+
+#: ../src/gtkpounce.c:591
+msgid "Starts _typing"
+msgstr "C_ommence � 辿crire"
+
+#: ../src/gtkpounce.c:593
+msgid "Stops t_yping"
+msgstr "_S'arr棚te d'辿crire"
+
+#: ../src/gtkpounce.c:595
+msgid "Sends a _message"
+msgstr "Envoi d'un _message"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:627
+msgid "Action"
+msgstr "Action"
+
+#: ../src/gtkpounce.c:635
+msgid "Ope_n an IM window"
+msgstr "Ouvrir une _fen棚tre de conversation"
+
+#: ../src/gtkpounce.c:637
+msgid "_Pop up a notification"
 msgstr "Ouvrir une fen棚tre de _notification"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:639
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:641
 msgid "E_xecute a command"
 msgstr "Ex辿cuter une c_ommande"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:643
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: ../src/gtkpounce.c:648
+msgid "Brows_e..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
+#: ../src/gtkpounce.c:650
+msgid "Br_owse..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:651
 msgid "Pre_view"
 msgstr "Pr辿_visualisation"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "_Sauver cette alerte apr竪s d辿clenchement"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Enlever une alerte"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:763
+msgid "Options"
+msgstr "Options"
+
+#: ../src/gtkpounce.c:771
+msgid "P_ounce only when my status is not available"
+msgstr "Alerter _uniquement quand mon 辿tat est non disponible"
+
+#: ../src/gtkpounce.c:776
+msgid "_Recurring"
+msgstr "_R辿currente"
+
+#: ../src/gtkpounce.c:1090
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "�tes-vous s短r de vouloir supprimer l'alerte sur %s pour %s�?"
+
+#: ../src/gtkpounce.c:1238
+msgid "Pounce Target"
+msgstr "Cible de l'alerte"
+
+#: ../src/gtkpounce.c:1273
+msgid "Recurring"
+msgstr "R辿currente"
+
+#: ../src/gtkpounce.c:1320
+msgid "Buddy Pounces"
+msgstr "Alertes"
+
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous 辿crire (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arr棚t辿 de vous 辿crire (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se d辿connecter (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est pass辿 absent (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1463
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s vous a envoy辿 un message. (%s)"
+
+#: ../src/gtkpounce.c:1464
 msgid "Unknown pounce event. Please report this!"
 msgstr "�v辿nement d'alerte inconnu. Veuillez reporter cette erreur."
 
-#: src/gtkprefs.c:623
+#: ../src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr "Le th竪me de frimousses n'a pas pu 棚tre d辿ball辿."
+
+#: ../src/gtkprefs.c:638
 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."
@@ -3831,41 +4585,52 @@
 "dessous.  De nouveau th竪mes peuvent 棚tre install辿s en les faisant glisser "
 "dans la liste des th竪mes."
 
-#: src/gtkprefs.c:658
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Ic担ne"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:805
+#: ../src/gtkprefs.c:821
+msgid "_Hide new IM conversations"
+msgstr "_Cacher les nouvelles conversations"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+msgid "When away"
+msgstr "Lorsque absent"
+
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Envoyer les commandes 束�_barre�損 inconnues en message"
 
-#: src/gtkprefs.c:807
-#, fuzzy
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
-msgstr "Afficher la barre de _style"
-
-#: src/gtkprefs.c:809
+msgstr "Afficher le _style des nouveaux messages"
+
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "Afficher les _ic担nes des contacts"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "Activer l'anima_tion de l'ic担ne des contacts"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifier les contacts que vous 棚tes en train de leur 辿crire"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: ../src/gtkprefs.c:845
+msgid "Highlight _misspelled words"
 msgstr "Surligner les mots mal _orthographi辿s"
 
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr "Utiliser le d辿filement progressif"
+
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3874,164 +4639,160 @@
 "supportant l'ajout du style. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "Options des onglets"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Afficher les messages et les discussions dans des fen棚tres � _onglets"
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "Afficher le bouton de fermeture (_X) sur les onglets"
 
-#: src/gtkprefs.c:878
-#, fuzzy
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
-msgstr "ExtEmplacement"
-
-#: src/gtkprefs.c:880
+msgstr "_Position�:"
+
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "Haut"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "Bas"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "Gauche"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "Droite"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "Verticalement � gauche"
+
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
-#, fuzzy
+msgstr "Verticalement � droite"
+
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
-msgstr "Fermer la conversation"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "Nouvelles conversations�:"
+
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
+#: ../src/protocols/oscar/oscar.c:6107
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "_Serveur�:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: ../src/gtkprefs.c:975
+msgid "ST_UN server:"
+msgstr "Serveur ST_UN�:"
+
+#: ../src/gtkprefs.c:977
+msgid "_Autodetect IP address"
 msgstr "_D辿tection auto de l'adresse IP"
 
-#: src/gtkprefs.c:955
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
 msgstr "Adresse _IP publique�:"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "Sp辿cifier _manuellement la plage de ports � 辿couter"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: ../src/gtkprefs.c:1020
+msgid "_Start port:"
 msgstr "_Premier port�: "
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: ../src/gtkprefs.c:1027
+msgid "_End port:"
 msgstr "_Dernier port�:"
 
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "Aucun"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
 msgstr "_Utilisateur�:"
 
-#: src/gtkprefs.c:1119
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
 msgstr "Navigateur de Gnome"
 
-#: src/gtkprefs.c:1124
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
 msgstr "_Navigateur�:"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
 msgstr "_Ouvrir le lien�:"
 
-#: src/gtkprefs.c:1203
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "Dans une fen棚tre ouverte"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4040,57 +4801,83 @@
 "_Manuel�:\n"
 "(%s pour l'URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "Enregistrement"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: ../src/gtkprefs.c:1297
+msgid "Log _format:"
 msgstr "_Format des archive�:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
 msgstr "Archiver tous les _messages"
 
-#: src/gtkprefs.c:1266
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Archiver tous les _changements d'辿tat dans les archives syst竪me"
+
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "Charger un son"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "Le plus silencieux"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "Tr竪s silencieux"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "Silencieux"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "Normal"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "Fort"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "Tr竪s fort"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "Le plus fort"
+
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
 msgstr "_M辿thode�:"
 
-#: src/gtkprefs.c:1457
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "Commande"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
-msgstr "Sons"
-
-#: src/gtkprefs.c:1473
+msgstr "Pas de sons"
+
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4099,371 +4886,388 @@
 "_Commande � utiliser�:\n"
 "(%s pour le nom de fichier)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons m棚me quand la _fen棚tre est active"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "Jouer les sons m棚me lorsque vous 棚tes _absent"
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1592
+msgid "Volume:"
+msgstr "Volume�:"
+
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "�v辿nements sonores"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "�v辿nement"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "Tester"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "Remise � z辿ro"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "Absent"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "Mise en _attente des messages pendant l'absence"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1747
+msgid "_Report idle time:"
+msgstr "_Rapporter le temps d'inactivit辿�:"
+
+#: ../src/gtkprefs.c:1750
+msgid "From last sent message"
+msgstr "Depuis le dernier message envoy辿"
+
+#: ../src/gtkprefs.c:1752
+msgid "Based on keyboard or mouse use"
+msgstr "Selon l'activit辿 du clavier ou de la souris"
+
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "_R辿ponse automatique�:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Lorsque absent"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
-#: src/gtkprefs.c:1662
-#, fuzzy
-msgid "_Report idle time"
-msgstr "Afficher les _temps d'inactivit辿"
-
-#: src/gtkprefs.c:1665
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
-msgstr "Se mettre absent _lorsque inactif"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "Changer d'辿tat lorsque _inactif"
+
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
-msgstr "_Minutes avant de passer absent�:"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "_Minutes avant de changer d'辿tat�:"
+
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
-msgstr "Nouvelle adresse�:"
-
-#: src/gtkprefs.c:1728
+msgstr "_Changer l'辿tat en�:"
+
+#. Signon status stuff
+#: ../src/gtkprefs.c:1806
+msgid "Status at startup"
+msgstr "�tat au d辿marrage"
+
+#: ../src/gtkprefs.c:1808
+msgid "Use status from last _exit at startup"
+msgstr "Utiliser l'辿tat � la _fermeture"
+
+#: ../src/gtkprefs.c:1814
+msgid "Status to a_pply at startup:"
+msgstr "�tat _utilis辿 au d辿marrage�:"
+
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "Th竪mes des frimousses"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "R辿seau"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
 msgstr "Absence/inactivit辿"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permettre � tous les utilisateurs de me contacter"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Autoriser uniquement les utilisateurs de ma liste de contacts"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Autoriser les utilisateurs ci-dessous"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloquer tous les utilisateurs"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Filtres"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Les changements prennent effet imm辿diatement."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "G辿rer les filtres pour�:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Autoriser un utilisateur"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Personne � autoriser"
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 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:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "Autoriser un utilisateur"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "_Autoriser"
+
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permettre � %s de vous contacter�?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, 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:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Bloquer un utilisateur"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Personne � bloquer"
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 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:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Bloquer"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Bloquer"
+
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s�?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�tes-vous s短r de vouloir bloquer %s�?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Oui"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Non"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:289
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:290 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1839
 msgid "That file already exists"
 msgstr "Ce fichier existe d辿j�"
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1840
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'辿craser�?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1884 ../src/gtkrequest.c:1925
 msgid "Save File..."
 msgstr "Sauver le fichier..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1885 ../src/gtkrequest.c:1926
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "Liste des salons de discussion"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "R辿cup辿rer la _liste"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "_Ajouter une discussion"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Titre"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "Type"
+
+#. Available status messages are plain text
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
+#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
+#: ../src/protocols/sametime/sametime.c:3274
+#: ../src/protocols/sametime/sametime.c:3280
+#: ../src/protocols/sametime/sametime.c:3286
+#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3278 ../src/protocols/yahoo/yahoo.c:3284
+#: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Message"
 
-#: src/gtksavedstatuses.c:451
-#, fuzzy
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
-msgstr "Statistiques du serveur"
+msgstr "�tats pr辿d辿finis"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "_Utiliser"
 
-#: src/gtksavedstatuses.c:584
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "Par 辿tat"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "Ce titre est d辿j� utilis辿. Vous devez saisir un titre unique."
+
+#: ../src/gtksavedstatuses.c:879
+msgid "Different"
+msgstr "Diff辿rent"
+
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/yahoo/yahoo.c:2880
 msgid "Status"
 msgstr "�tat"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
-msgstr "Titre"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "_Titre�:"
+
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
-msgstr "Status�:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "�_tat�:"
+
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+msgstr "Utiliser un 辿tat _diff辿rent pour certains comptes"
+
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1188
+msgid "Sa_ve & Use"
+msgstr "Enregistrer _et utiliser"
+
+#: ../src/gtksavedstatuses.c:1394
+#, c-format
+msgid "Status for %s"
+msgstr "�tat pour %s"
+
+#: ../src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Connexion d'un contact"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "D辿connexion d'un contact"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63
 msgid "Message received"
 msgstr "R辿ception d'un message"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "D辿but d'une conversation"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65
 msgid "Message sent"
 msgstr "Envoi d'un message"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "Quelqu'un entre dans la discussion"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Quelqu'un quitte la discussion"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Vous parlez dans la discussion"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Quelqu'un parle dans la discussion"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Quelqu'un dit votre nom dans la discussion"
 
-#: src/gtksound.c:414
+#: ../src/gtksound.c:488
 #, 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:430
+#: ../src/gtksound.c:504
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4471,7 +5275,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:442
+#: ../src/gtksound.c:516
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4480,180 +5284,161 @@
 "Impossible de jouer les sons. La commande de m辿thode de sons n'a pas pu 棚tre "
 "lanc辿e�: %s"
 
-#: src/gtkstatusbox.c:197
-#, fuzzy
+#: ../src/gtkstatusbox.c:362
 msgid "Typing"
-msgstr "Ping"
+msgstr "En train d'辿crire"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:980 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "Disponible"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "D辿connect辿"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "Personnalis辿"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "Sauver le fichier..."
-
-#: src/gtkstock.c:117
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "Fermer les _onglets"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "_R辿cup辿rer les infos"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "_Inviter"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_Ouvrir le courrier"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_R辿primander"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#: ../src/gtkutils.c:1303 ../src/gtkutils.c:1328
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Une erreur inconnue est survenue � la connexion�: %s"
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "L'erreur suivante est survenue au chargement de %s�: %s"
+
+#: ../src/gtkutils.c:1305 ../src/gtkutils.c:1330
 msgid "Failed to load image"
-msgstr "Impossible de sauver l'image�: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "Impossible de charger l'image."
+
+#: ../src/gtkutils.c:1405
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "Impossible d'envoyer le fichier"
-
-#: src/gtkutils.c:1497
+msgstr "Impossible d'envoyer le dossier %s."
+
+#: ../src/gtkutils.c:1407
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+"Gaim ne peut pas transf辿rer de dossier. Vous devez envoyer les fichiers du "
+"dossier individuellement."
+
+#: ../src/gtkutils.c:1435 ../src/gtkutils.c:1444 ../src/gtkutils.c:1449
 msgid "You have dragged an image"
-msgstr "Nom d'utilisateur saisi non valide"
-
-#: src/gtkutils.c:1526
+msgstr "Vous avez d辿pos辿 une image."
+
+#: ../src/gtkutils.c:1436
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+"Vous pouvez envoyer cette image � votre correspondant, l'incorporer dans ce "
+"message ou l'utiliser en tant qu'ic担ne pour cet utilisateur."
+
+#: ../src/gtkutils.c:1440 ../src/gtkutils.c:1455
 msgid "Set as buddy icon"
-msgstr "Afficher les _ic担nes des contacts"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Utiliser comme ic担ne"
+
+#: ../src/gtkutils.c:1441 ../src/gtkutils.c:1456
 msgid "Send image file"
-msgstr "Envoyer le message"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Envoyer l'image"
+
+#: ../src/gtkutils.c:1442 ../src/gtkutils.c:1456
 msgid "Insert in message"
-msgstr "Ins辿rer une image"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "Ins辿rer dans un message"
+
+#: ../src/gtkutils.c:1445
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Voulez-vous joindre la conversation�?"
-
-#: src/gtkutils.c:1540
+msgstr "Voulez-vous l'utiliser en tant qu'ic担ne pour cette utilisateur�?"
+
+#: ../src/gtkutils.c:1450
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1542
+"Vous pouvez envoyer cette image � votre correspondant ou l'utiliser en tant "
+"qu'ic担ne pour cet utilisateur."
+
+#: ../src/gtkutils.c:1452
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
+"Vous pouvez incorporer cette image dans ce message ou l'utiliser en tant "
+"qu'ic担ne pour cet utilisateur."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
+#: ../src/gtkutils.c:1506
 msgid "Cannot send launcher"
-msgstr "Impossible d'envoyer le fichier"
-
-#: src/gtkutils.c:1596
+msgstr "Impossible d'envoyer ce lien."
+
+#: ../src/gtkutils.c:1506
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-
-#: src/log.c:129
+"Vous avez d辿pos辿 un lien du bureau. Vous vouliez probablement envoyer le "
+"fichier vers lequel pointe ce lien au lieu du lien."
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Envoyer une requ棚te Doodle."
+
+#: ../src/log.c:165
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color\"=red\">L'archiveur n'a pas de fonction de lecture</font></b>"
 
-#: src/log.c:577
+#: ../src/log.c:547
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:558
+msgid "Plain text"
+msgstr "Texte en clair"
+
+#: ../src/log.c:569
+msgid "Old Gaim"
+msgstr "Ancien Gaim"
+
+#: ../src/log.c:668
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "�chec de l'archivage de cette conversation."
+
+#: ../src/log.c:969
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1037
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4662,7 +5447,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:906
+#: ../src/log.c:1039
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4671,23 +5456,42 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;R辿ponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1096 ../src/log.c:1218
 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:967 src/log.c:1086
+#: ../src/log.c:1108 ../src/log.c:1230
 #, 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:1019
+#: ../src/log.c:1161
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <R辿ponse automatique>�: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Le num辿ro magique du plugin diff竪re�: %d (%d attendu)."
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "La version de l'ABI diff竪re�: %d.%d.x (%d.%d.x attendue)."
+
+#: ../src/plugin.c:457
+msgid "Plugin does not implement all required functions"
+msgstr "Le plugin ne poss竪de pas toutes les fonctions attendues."
+
+#: ../src/plugin.c:514
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4696,39 +5500,58 @@
 "Le plugin d辿pendant %s est introuvable. Veuillez installer ce plugin et "
 "recommencer."
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Impossible de charger le plugin"
-
-#: src/plugin.c:360
+#: ../src/plugin.c:519
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Erreur au chargement du plugin."
+
+#: ../src/plugin.c:542
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Le plugin d辿pendant %s n'a pas pu 棚tre charg辿."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Inactif"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: ../src/plugin.c:546
+msgid "Gaim was unable to load your plugin."
+msgstr "Impossible de charger le plugin"
+
+#: ../src/plugin.c:648
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "Le plugin d辿pendant %s n'a pas pu 棚tre d辿charg辿."
+
+#: ../src/plugin.c:653
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Erreur au d辿chargement du plugin."
+
+#. Send a message about the connection error
+#: ../src/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
+
+#: ../src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Impossible d'辿tablir une connexion vers le serveur local mDNS. Fonctionne-t-"
+"il�?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Status�:</b> Fabuleux"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>�tat�:</b> %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s�:</b> %s"
+"<b>Message�:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4740,350 +5563,351 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
-msgstr "Plugin pour le protocole Yahoo"
+msgstr "Plugin pour le protocole Bonjour"
+
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538
+msgid "Gaim User"
+msgstr "Utilisateur de Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "Nom�:"
+#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:931
+msgid "Hostname"
+msgstr "Nom d'h担te�:"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/irc/irc.c:901
+#: ../src/protocols/msn/msn.c:1957 ../src/protocols/napster/napster.c:725
+#: ../src/protocols/sametime/sametime.c:5644 ../src/protocols/silc/silc.c:1856
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "Pr辿nom�:"
 
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "Nom�:"
 
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+#: ../src/protocols/bonjour/bonjour.c:589 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "Courrier 辿lectronique"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
+msgid "Token Error"
+msgstr "Erreur de jeton"
+
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
+msgid "Unable to fetch the token.\n"
+msgstr "Impossible de r辿cup辿rer le jeton.\n"
+
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
 msgid "Save Buddylist..."
-msgstr "Envoyer sa liste de contacts"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Sauver la liste de contacts..."
+
+#: ../src/protocols/gg/gg.c:227
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "Votre liste de contacts est vide, rien n'a 辿t辿 sauv辿."
+
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
 msgid "Couldn't open file"
-msgstr "Impossible d'envoyer le fichier"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "Impossible d'ouvrir le fichier"
+
+#: ../src/protocols/gg/gg.c:246
 msgid "Buddylist saved successfully!"
-msgstr "Changement de mot de passe effectu辿"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "Impossible d'envoyer le fichier"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "Sauvegarde de la liste de contacts effectu辿e."
+
+#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+msgid "Couldn't load buddylist"
+msgstr "Impossible de charger la liste de contacts."
+
+#: ../src/protocols/gg/gg.c:281
 msgid "Load Buddylist..."
-msgstr "Donner un _alias..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "Charger une liste de contacts..."
+
+#: ../src/protocols/gg/gg.c:282
 msgid "Buddylist loaded successfully!"
-msgstr "Changement de mot de passe effectu辿"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "Chargement de liste de contacts effectu辿."
+
+#: ../src/protocols/gg/gg.c:293
 msgid "Save buddylist..."
-msgstr "Envoyer sa liste de contacts"
-
-#: src/protocols/gg/gg.c:254
+msgstr "Sauver la liste de contacts..."
+
+#: ../src/protocols/gg/gg.c:337
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "Saisissez les champs d'inscription."
+
+#: ../src/protocols/gg/gg.c:342
 msgid "Passwords do not match."
-msgstr "Les nouveaux mots de passe diff竪rent"
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "Les mots de passe diff竪rent."
+
+#: ../src/protocols/gg/gg.c:351
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Impossible de cr辿er une nouvelle connexion"
-
-#: src/protocols/gg/gg.c:279
+msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte.\n"
+
+#: ../src/protocols/gg/gg.c:364
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "Nouveau compte Gadu-Gadu cr辿辿."
+
+#: ../src/protocols/gg/gg.c:365
 msgid "Registration completed successfully!"
-msgstr "Enregistrement aupr竪s du serveur r辿ussi"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgstr "Inscription effectu辿e."
+
+#: ../src/protocols/gg/gg.c:425
+msgid "e-Mail"
+msgstr "Courriel"
+
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1307
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+msgid "Password (retype)"
+msgstr "Mot de passe (pour v辿rification)"
+
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+msgid "Enter current token"
+msgstr "Saisissez le jeton actuel"
+
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+msgid "Current token"
+msgstr "Jeton actuel"
+
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+msgid "Register New Gadu-Gadu Account"
+msgstr "Cr辿er un nouveau compte Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:452
+msgid "Please, fill in the following fields"
+msgstr "Veuillez saisir les champs suivants."
+
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+msgid "Unable to initiate a new search"
+msgstr "Impossible d'effectuer une nouvelle recherche."
+
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "Vous avez une recherche en attente. Veuillez patienter jusqu'� sa fin."
+
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:784 ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/oscar/oscar.c:6161
 msgid "City"
 msgstr "Localit辿"
 
-#: src/protocols/gg/gg.c:417
+#: ../src/protocols/gg/gg.c:577
 msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
+msgstr "Ann辿e de naissance"
+
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
+#: ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Gender"
+msgstr "Genre"
+
+#: ../src/protocols/gg/gg.c:581
+msgid "Male or female"
+msgstr "Homme ou femme"
+
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
+msgid "Male"
+msgstr "Homme"
+
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
+msgid "Female"
+msgstr "Femme"
+
+#: ../src/protocols/gg/gg.c:587
 msgid "Only online"
-msgstr "En ligne"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
+msgstr "En ligne seulement"
+
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
 msgid "Find buddies"
-msgstr "_Griser les contacts inactifs"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
+msgstr "Trouver des contacts"
+
+#: ../src/protocols/gg/gg.c:593
 msgid "Please, enter your search criteria below"
-msgstr "Saisissez votre nouveau mot de passe"
-
-#: src/protocols/gg/gg.c:465
+msgstr "Saisissez votre crit竪re de recherche ci-dessous."
+
+#: ../src/protocols/gg/gg.c:630
 msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
+msgstr "Saisissez les champs."
+
+#: ../src/protocols/gg/gg.c:642
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
+msgstr "Votre mot de passe actuel diff竪re de celui que vous venez de saisir."
+
+#: ../src/protocols/gg/gg.c:656
 msgid "Unable to change password. Error occured.\n"
-msgstr "Impossible de changer le mot de passe Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
+msgstr "Une erreur est survenue. Impossible de changer le mot de passe.\n"
+
+#: ../src/protocols/gg/gg.c:665
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Changer le mot de passe pour %s"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
+msgstr "Changer le mot de passe du compte Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:666
 msgid "Password was changed successfully!"
-msgstr "Changement de mot de passe effectu辿"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Erreur inconnue"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Impossible de r辿cup辿rer la liste des salons"
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
+msgstr "Changement de mot de passe effectu辿."
+
+#: ../src/protocols/gg/gg.c:699
 msgid "Current password"
-msgstr "Mot de passe incorrect"
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Mot de passe"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Mot de passe envoy辿"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s n'est pas en ligne"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "Actuellement dans"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
+msgstr "Mot de passe actuel"
+
+#: ../src/protocols/gg/gg.c:724
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+msgstr ""
+"Saisissez votre mot de passe et un nouveau mot de passe pour ;'identifiant�: "
+
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
 msgid "Change Gadu-Gadu Password"
-msgstr "Impossible de changer le mot de passe Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+msgstr "Changer le le mot de passe Gadu-Gadu"
+
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Supprimer le salon de discussion de la liste de contacts"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+msgstr "Choisissez un salon de discussion pour le contact�: %s"
+
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
 msgid "Add to chat..."
-msgstr "Ajouter une d_iscussion"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Impossible de lire le socket"
-
-#: src/protocols/gg/gg.c:959
+msgstr "Ajouter � la discussion..."
+
+#: ../src/protocols/gg/gg.c:950
+msgid "No matching users found"
+msgstr "Aucun utilisateur correspondant trouv辿."
+
+#: ../src/protocols/gg/gg.c:951
+msgid "There are no users matching your search criteria."
+msgstr "Il n'y a pas d'utilisateurs qui v辿rifient votre crit竪re de recherche."
+
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6264
+msgid "Unable to display the search results."
+msgstr "Impossible d'afficher les r辿sultats de la recherche."
+
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
+msgid "UIN"
+msgstr "UIN"
+
+#: ../src/protocols/gg/gg.c:980
+msgid "Birth year"
+msgstr "Ann辿e de naissance"
+
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
+msgstr "Annuaire public Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "R辿sultats de la recherche"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "En ligne"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Occup辿"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
-msgid "Blocked"
-msgstr "Bloqu辿"
-
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
-msgid "Add to chat"
-msgstr "Ajouter discussion"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
-msgid "Unblock"
-msgstr "Bloquer"
-
-#: src/protocols/gg/gg.c:1149
-#, fuzzy
-msgid "Chat _name:"
-msgstr "Nom�:"
-
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+msgid "Unable to read socket"
+msgstr "Impossible de lire le socket"
+
+#: ../src/protocols/gg/gg.c:1201
+msgid "Buddy list downloaded"
+msgstr "Liste de contacts t辿l辿charg辿e"
+
+#: ../src/protocols/gg/gg.c:1202
+msgid "Your buddy list was downloaded from the server."
+msgstr "Votre liste de contacts � 辿t辿 r辿cup辿r辿e depuis le serveur."
+
+#: ../src/protocols/gg/gg.c:1209
+msgid "Buddy list uploaded"
+msgstr "Liste des contacts envoy辿e"
+
+#: ../src/protocols/gg/gg.c:1210
+msgid "Your buddy list was stored on the server."
+msgstr "Votre liste de contacts � 辿t辿 stock辿e sur le serveur."
+
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
 msgid "Connection failed."
 msgstr "�chec de la connexion"
 
-#: src/protocols/gg/gg.c:1357
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+msgid "Blocked"
+msgstr "Bloqu辿"
+
+#: ../src/protocols/gg/gg.c:1468
+msgid "Add to chat"
+msgstr "Ajouter � la discussion"
+
+#: ../src/protocols/gg/gg.c:1477
+msgid "Unblock"
+msgstr "D辿bloquer"
+
+#: ../src/protocols/gg/gg.c:1481
+msgid "Block"
+msgstr "Bloquer"
+
+#: ../src/protocols/gg/gg.c:1498
+msgid "Chat _name:"
+msgstr "_Nom de la discussion�:"
+
+#: ../src/protocols/gg/gg.c:1724
 msgid "Chat error"
-msgstr "Erreur de lecture"
-
-#: src/protocols/gg/gg.c:1358
-#, fuzzy
+msgstr "Erreur de discussion"
+
+#: ../src/protocols/gg/gg.c:1725
 msgid "This chat name is already in use"
-msgstr "Ce fichier existe d辿j�"
-
-#: src/protocols/gg/gg.c:1435
-#, fuzzy
+msgstr "Ce nom de discussion est d辿j� utilis辿."
+
+#: ../src/protocols/gg/gg.c:1808
 msgid "Not connected to the server."
-msgstr "Vous avez 辿t辿 d辿connect辿 du serveur"
-
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "Courriel"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Enregistrer un nouveau compte Jabber"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "Changer de mot de passe"
-
-#: src/protocols/gg/gg.c:1520
-#, fuzzy
+msgstr "Vous n'棚tes pas connect辿 au serveur"
+
+#: ../src/protocols/gg/gg.c:1831
+msgid "Find buddies..."
+msgstr "Trouver des contacts..."
+
+#: ../src/protocols/gg/gg.c:1837
+msgid "Change password..."
+msgstr "Changer de mot de passe..."
+
+#: ../src/protocols/gg/gg.c:1843
 msgid "Upload buddylist to Server"
-msgstr "Exporter la liste de contacts vers le serveur"
-
-#: src/protocols/gg/gg.c:1523
-#, fuzzy
+msgstr "Envoyer la liste de contacts sur le serveur"
+
+#: ../src/protocols/gg/gg.c:1847
 msgid "Download buddylist from Server"
-msgstr "Effacer la liste de contacts du serveur"
-
-#: src/protocols/gg/gg.c:1526
-#, fuzzy
+msgstr "R辿cup辿rer la liste de contacts du serveur"
+
+#: ../src/protocols/gg/gg.c:1851
 msgid "Delete buddylist from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
-msgstr "Importer la liste de contacts du serveur"
+#: ../src/protocols/gg/gg.c:1855
+msgid "Save buddylist to file..."
+msgstr "Sauver la liste de contacts dans un fichier..."
+
+#: ../src/protocols/gg/gg.c:1859
+msgid "Load buddylist from file..."
+msgstr "Charger la liste de contacts depuis un fichier..."
 
 #. magic
 #. major_version
@@ -5096,119 +5920,119 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "Messagerie polonaise populaire"
+
+#: ../src/protocols/gg/gg.c:1998
 msgid "Gadu-Gadu User"
-msgstr "Moteur de recherche de Gadu-Gadu"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Utilisateur Gadu-Gadu"
+
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue�: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1290
 #, c-format
 msgid "current topic is: %s"
 msgstr "Le sujet courant est�: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1294
 msgid "No topic is set"
 msgstr "Pas de sujet"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
-msgstr "Transfert de fichier annul辿"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "�chec du transfert de fichier"
+
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Impossible d'ouvrir un port en 辿coute"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Erreur � l'affichage du message du jour"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "Message du jour non disponible"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79
 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:83
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "D辿connexion par le serveur"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "Voir le message du jour"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Salon�:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Mot de _passe�:"
 
-#: src/protocols/irc/irc.c:238
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les surnoms IRC ne peuvent pas avoir d'espace"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:889
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
+#: ../src/protocols/simple/simple.c:1427
 msgid "Couldn't create socket"
 msgstr "Impossible de cr辿er le socket"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:420
+#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter � l'h担te"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:447
 msgid "Connection Failed"
 msgstr "�chec de la connexion"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:450
 msgid "SSL Handshake Failed"
 msgstr "�chec de la poign辿e de main SSL"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Sujet"
 
@@ -5220,34 +6044,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:878
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:879
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:898 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1906
+#: ../src/protocols/napster/napster.c:720
+#: ../src/protocols/sametime/sametime.c:5639 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1663
 msgid "Server"
 msgstr "Serveur"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:904
 msgid "Encodings"
 msgstr "Codages"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:907 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
+#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Utilisateur"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:910
 msgid "Real name"
 msgstr "Nom r辿el"
 
@@ -5255,159 +6082,172 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
-#, fuzzy
+#: ../src/protocols/irc/irc.c:918
 msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "Utiliser SSL"
+
+#: ../src/protocols/irc/msgs.c:103
 msgid "Bad mode"
 msgstr "Mauvais mode"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:114
 #, c-format
 msgid "You are banned from %s."
 msgstr "Vous avez 辿t辿 banni de %s"
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:115
 msgid "Banned"
 msgstr "Banni"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:132
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Impossible de bannir %s�: la liste des bannis est pleine"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s�:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:214
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:215
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifi辿)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s�:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "Nom r辿el"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Actuellement dans"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:242
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactif depuis�:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:244
 msgid "Online since"
 msgstr "En ligne depuis"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Qualificatif�:</b> Glorieux<br>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:316
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s a chang辿 le sujet en�: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:321
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Le sujet de %s est�: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:338
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Message inconnu '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339
 msgid "Unknown message"
 msgstr "Message inconnu"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339
 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:363
+#: ../src/protocols/irc/msgs.c:362
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilisateurs dans %s�: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:490
 msgid "Time Response"
 msgstr "Temps de r辿ponse"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:491
 msgid "The IRC server's local time is:"
 msgstr "L'heure locale du serveur IRC est�:"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:502
 msgid "No such channel"
 msgstr "Ce salon n'existe pas"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:513
 msgid "no such channel"
 msgstr "Ce salon n'existe pas"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:516
 msgid "User is not logged in"
 msgstr "Utilisateur non connect辿"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such nick or channel"
 msgstr "Ce pseudo ou salon n'existe pas"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:541
 msgid "Could not send"
 msgstr "Impossible d'envoyer"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joindre %s n辿cessite une invitation"
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:598
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:699
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vous avez 辿t辿 expuls辿 par %s (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expuls辿 par %s (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:727
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) par %s"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+msgid "Invalid nickname"
+msgstr "Pseudonyme non valide"
+
+#: ../src/protocols/irc/msgs.c:814
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Le pseudonyme choisi a 辿t辿 rejet辿 par le serveur. Il contenait probablement "
+"des caract竪res non valides."
+
+#: ../src/protocols/irc/msgs.c:818
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5415,68 +6255,71 @@
 "Le nom de compte choisi a 辿t辿 rejet辿 par le serveur. Le nom contenait "
 "probablement des caract竪res non valides."
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:879
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Vous avez quitt辿 le salon�%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:921
 msgid "Error: invalid PONG from server"
 msgstr "PONG non valide du serveur"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:923
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "R辿ponse au PING -- Lag�: %lu secondes"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:998
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossible de joindre le salon %s�:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossible d'entrer dans le salon"
 
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
+#: ../src/protocols/irc/msgs.c:1033
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Le service est temporairement indisponible."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "Le pseudonyme ou le service est temporairement indisponible."
+
+#: ../src/protocols/irc/msgs.c:1045
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action � faire&gt;�: R辿aliser une action."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [message]�: Mettre un message d'absence. Sans message, cela enl竪ve le "
-"status d'absence."
-
-#: src/protocols/irc/parse.c:116
+"away [message]�: Mettre un message d'absence. Sans message, cela enl竪ve "
+"l'辿tat d'absence."
+
+#: ../src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv�: Envoyer une commande au service des salons."
+
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;pseudo1&gt; [pseudo2] ...�: Enlever le status d'op辿rateur. Vous "
+"deop &lt;pseudo1&gt; [pseudo2] ...�: Enlever le pouvoir d'op辿rateur. Vous "
 "devez 棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5486,7 +6329,7 @@
 "mod辿r辿 (+m). Vous devez 棚tre un op辿rateur du salon pour utiliser cette "
 "commande."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5494,23 +6337,23 @@
 "invite &lt;pseudo&gt; [salon]�: Inviter une personne dans un salon. Vous "
 "devez 棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]]�: Joindre un ou "
+"j &lt;salon1&gt;[,salon2][,...] [cl辿1[,cl辿2][,...]]�: Joindre un ou "
 "plusieurs salons, en indiquant le mot de passe de chaque salon si n辿cessaire."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]]�: Joindre un ou "
+"join &lt;salon1&gt;[,salon2][,...] [cl辿1[,cl辿2][,...]]�: Joindre un ou "
 "plusieurs salons, en indiquant le mot de passe de chaque salon si n辿cessaire."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5518,7 +6361,7 @@
 "kick &lt;pseudo1&gt; [message]�: Expulser une personne du salon. Vous devez "
 "棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5526,11 +6369,15 @@
 "list�: Afficher la liste des salons sur le r辿seaux. <i>Attention, certains "
 "serveurs peuvent vous d辿connecter � ce moment-l�.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action � faire&gt;�: R辿aliser une action."
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv�: Envoyer une commande au service des messages."
+
+#: ../src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5538,30 +6385,34 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;pseudo|salon&gt;�: Changer le mode d'un "
 "salon ou d'une personne."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt;�: Envoyer un message priv辿 � une personne."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [salon]�: R辿cup辿rer la liste des personnes dans un salon."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nouveau pseudo&gt;�: Changer de pseudonyme"
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv�: Envoyer une commande au service des pseudonymes."
+
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;pseudo1&gt; [pseudo2] ...�: Donner le status d'op辿rateur. Vous devez "
+"op &lt;pseudo1&gt; [pseudo2] ...�: Donner le pouvoir d'op辿rateur. Vous devez "
 "棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5569,7 +6420,11 @@
 "operwall &lt;message&gt;�: Si vous ne connaissez pas cette commande, c'est "
 "que vous ne pouvez probablement pas l'utiliser. "
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr "operserv�: Envoyer une commande au service des op辿rateurs."
+
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5577,7 +6432,7 @@
 "part [salon] [message]�: Quitter un salon avec un message de d辿part "
 "facultatif."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5585,7 +6440,7 @@
 "ping [pseudo]�: Demander la latence d'une personne (ou du serveur s'il n'y a "
 "pas de pseudo)."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5593,17 +6448,17 @@
 "query &lt;pseudo&gt; &lt;message&gt;�: Envoyer un message priv辿 � une "
 "personne."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [message]�: Se d辿connecter du serveur avec un message de d辿part "
 "facultatif."
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]�: Envoyer une commande directe au serveur."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5611,19 +6466,19 @@
 "remove &lt;pseudo1&gt; [message]�: Expulser une personne du salon. Vous "
 "devez 棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time�: Afficher l'heure locale du serveur irc."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nouveau sujet]�: Voir ou changer le sujet du salon"
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;�: Changer le mode d'une personne."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5631,7 +6486,7 @@
 "voice &lt;pseudo1&gt; [pseudo2] ...�: Donner la parole dans un salon mod辿r辿 "
 "(+m). Vous devez 棚tre un op辿rateur du salon pour utiliser cette commande."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5639,32 +6494,32 @@
 "wallops &lt;message&gt;�: Si vous ne connaissez pas cette commande, c'est "
 "que vous ne pouvez probablement pas l'utiliser. "
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 "whois [serveur] &lt;pseudo&gt;�: R辿cup辿rer des informations sur une personne."
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de r辿ponse de %s�: %lu secondes"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "R辿ponse au CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1710 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
+#: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "D辿connect辿"
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5672,30 +6527,30 @@
 "TLS/SSL est n辿cessaire pour la connexion au serveur. Choisissez 束�Utiliser "
 "TLS si possible�損 dans les pr辿f辿rences du compte."
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "TLS/SSL est n辿cessaire pour la connexion au serveur. Aucun support de TLS/"
 "SSL n'a pu 棚tre trouv辿."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Le serveur demande une authentification en texte non chiffr辿 au travers d'un "
 "flux crypt辿."
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "R辿ponse non valide du serveur"
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234
+msgid "Server couldn't authenticate you without a password"
+msgstr "Le serveur ne peut pas vous identifier sans mot de passe."
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffr辿"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5704,84 +6559,98 @@
 "connexion non crypt辿e. Voulez-vous autoriser ceci et continuer "
 "l'authentification�?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une m辿thode d'authentification non support辿e"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "R辿ponse non valide du serveur"
+
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "Demande d'acc竪s non valide du serveur"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/auth.c:719
+msgid "SASL error"
+msgstr "Erreur SASL"
+
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
 msgid "Street Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
 msgid "Locality"
 msgstr "Localit辿"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
 msgid "Region"
 msgstr "R辿gion"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:794
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "Pays"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "T辿l辿phone"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
 msgid "Organization Unit"
 msgstr "Service"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
 msgid "Role"
 msgstr "R担le"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6133
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "�diter la carte de visite Jabber"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5789,638 +6658,640 @@
 "Tous les champs ci-dessous sont facultatifs. Saisissez uniquement les "
 "informations que vous d辿sirez."
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Identifiant Jabber"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1909
 msgid "Resource"
 msgstr "Ressource"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Deuxi竪me pr辿nom"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:725
 msgid "P.O. Box"
 msgstr "Bo樽te postale"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1042
 msgid "Un-hide From"
 msgstr "Se montrer �"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1046
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1054
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de pr辿sence"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1061
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1070
 msgid "Unsubscribe"
 msgstr "D辿sinscription"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Erreur"
 
 # Repris du fr.po de gabber
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "Bavard"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Ne pas d辿ranger"
 
-#: src/protocols/jabber/buddy.c:1235
+#: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
+msgstr "Voici les r辿sultats de votre recherche."
+
+#: ../src/protocols/jabber/buddy.c:1381
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr "Saisissez un ou plusieurs crit竪res de recherche d'utilisateurs Jabber."
+
+#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:769
+#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Pr辿nom"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:774
+#: ../src/protocols/oscar/oscar.c:6111
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1400
 msgid "E-Mail Address"
 msgstr "Adresse 辿lectronique"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1409 ../src/protocols/jabber/buddy.c:1410
 msgid "Search for Jabber users"
-msgstr "Rechercher par adresse 辿lectronique"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "Rechercher des utilisateurs Jabber"
+
+#: ../src/protocols/jabber/buddy.c:1424
 msgid "Invalid Directory"
-msgstr "Erreur non valide"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "Annuaire non valide"
+
+#: ../src/protocols/jabber/buddy.c:1441
 msgid "Enter a User Directory"
-msgstr "Impossible d'envoyer un dossier"
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "Saisissez un annuaire d'utilisateurs"
+
+#: ../src/protocols/jabber/buddy.c:1442
 msgid "Select a user directory to search"
-msgstr "Choisissez un serveur de conf辿rences"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "Choisissez un annuaire d'utilisateurs pour la recherche"
+
+#: ../src/protocols/jabber/buddy.c:1445
 msgid "Search Directory"
-msgstr "_Chercher�: "
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "Annuaire de recherche"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Salon�:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Serveur�:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Gestionnaire�:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s n'est pas un nom de salon de discussion valide"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nom de salon non valide"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s n'est pas un nom de serveur valide"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nom de serveur non valide"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s n'est pas un identifiant de salon de discussion valide"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Identifiant de salon non valide"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Impossible de configurer"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Erreur de configuration du salon de discussion"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Ce salon de discussion ne peut pas 棚tre configur辿"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 "Le changement de pseudo n'est pas support辿 dans les salons de discussion non "
 "MUC"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
-#, fuzzy
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Erreur � la r辿cup辿ration de la liste des salons de discussion"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Serveur non valide"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Entrer dans un serveur de conf辿rences"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Choisissez un serveur de conf辿rences"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Erreur � l'initialisation de la session"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "Erreur d'辿criture"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:353 ../src/protocols/jabber/jabber.c:387
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:473 ../src/protocols/jabber/jabber.c:899
 msgid "Unable to create socket"
 msgstr "Impossible de cr辿er le socket"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber non valide"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:589
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s r辿ussi"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
 msgid "Registration Successful"
 msgstr "Enregistrement aupr竪s du serveur r辿ussi"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
 msgid "Already Registered"
 msgstr "D辿j� enregistr辿"
 
-#: src/protocols/jabber/jabber.c:643
+#: ../src/protocols/jabber/jabber.c:759
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/oscar/oscar.c:6162
 msgid "State"
 msgstr "�tat"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "T辿l辿phone"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:809
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:817
 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:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
 msgid "Register New Jabber Account"
 msgstr "Enregistrer un nouveau compte Jabber"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:984
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:990 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:999
 msgid "Re-initializing Stream"
 msgstr "R辿initialisation du flux"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
 msgid "Not Authorized"
 msgstr "Non autoris辿"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "Source (Destination en attente)"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "Source"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "Destination"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Aucun"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "Inscription"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
-msgstr "Port"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "Priorit辿"
+
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "Mot de passe chang辿"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "Le mot de passe a 辿t辿 modifi辿"
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "Changer de mot de passe Jabber"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "�diter les informations"
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8404
+#: ../src/protocols/silc/silc.c:1019
+msgid "Set User Info..."
+msgstr "�diter les informations..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Changer de mot de passe"
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8415
+#: ../src/protocols/silc/silc.c:1015
+msgid "Change Password..."
+msgstr "Changer de mot de passe..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "_Chercher�: "
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1338
+msgid "Search for Users..."
+msgstr "Chercher des contacts..."
+
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "Mauvaise requ棚te"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Conflit"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "Fonction non impl辿ment辿e"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Parti"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "Item non trouv辿"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
-msgstr "Identifiant Jabber malform辿"
-
-#: src/protocols/jabber/jabber.c:1273
+msgstr "Identifiant Jabber non valide."
+
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "Non autoris辿"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "Paiement n辿cessaire"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: src/protocols/jabber/jabber.c:1285
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouv辿"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "Pas de r辿ponse du serveur distant"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "Serveur surcharg辿"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "Inscription n辿cessaire"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Requ棚te non attendue"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "Autorisation annul辿e"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1463
 msgid "Incorrect encoding in authorization"
-msgstr "Encodage incorrect de l'Autorisation"
-
-#: src/protocols/jabber/jabber.c:1309
+msgstr "Encodage incorrect de l'autorisation"
+
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "M辿canisme d'autorisation non valide"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "M辿canisme d'autorisation trop faible"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1477
 msgid "Temporary Authentication Failure"
 msgstr "�chec temporaire de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Authentication Failure"
 msgstr "�chec de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais pr辿fixe de nom de domaine"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
-msgstr "Conflit de resource"
-
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+msgstr "Conflit de ressource"
+
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "H担te perdu"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "H担te inconnu"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "H担tes non correspondants"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "Violation des r竪gles"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "�chec de la connexion � distance"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
-msgstr "Limitation sur la resource"
-
-#: src/protocols/jabber/jabber.c:1359
+msgstr "Limitation sur la ressource"
+
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "Voir l'autre h担te"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
-msgstr "Arr棚t du syst棚me"
-
-#: src/protocols/jabber/jabber.c:1365
+msgstr "Arr棚t du syst竪me"
+
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "Condition non d辿finie"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "Codage de caract竪re non support辿"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non support辿"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "Version non support辿e"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML mal form辿"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossible de bannir l'utilisateur %s"
 
-#: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+#: ../src/protocols/jabber/jabber.c:1620
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Commande inconnue�: %s"
-
-#: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+msgstr "Affiliation inconnue�: 束�%s�損"
+
+#: ../src/protocols/jabber/jabber.c:1625
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Impossible d'inviter l'utilisateur (%s)"
-
-#: src/protocols/jabber/jabber.c:1521
+msgstr "Impossible d'affilier l'utilisateur %s � 束�%s�損"
+
+#: ../src/protocols/jabber/jabber.c:1644
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "R担le inconnu�: 束�%s�損"
+
+#: ../src/protocols/jabber/jabber.c:1651
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Impossible d'assigner le r担le 束�%s�損 pour l'utilisateur�: %s"
+
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossible d'expulser l'utilisateur %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config�: Configurer un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure�: Configurer un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [salon]�: Quitter le salon"
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register�: S'enregistrer dans un salon"
 
-#: src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nouveau sujet]�: Voir ou changer le sujet du salon"
 
-#: src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon]�: Bannir un utilisateur d'un salon"
 
-#: src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-
-#: src/protocols/jabber/jabber.c:1589
+"affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt;�: "
+"Change l'affiliation d'un utilisateur dans le salon."
+
+#: ../src/protocols/jabber/jabber.c:1777
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt;�: "
+"Assigne � un utilisateur un r担le dans le salon."
+
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;utilisateur&gt; [message]�: Inviter un utilisateur dans le salon"
 
-#: src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join &lt;room&gt; [serveur]�: Joindre une discussion sur le serveur"
 
-#: src/protocols/jabber/jabber.c:1601
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilisateur&gt; [salon]�: Expulser un utilisateur du salon"
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1800
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -6437,96 +7308,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1884 ../src/protocols/jabber/jabber.c:1886
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin pour le protocole Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1912
 msgid "Use TLS if available"
 msgstr "Utiliser TLS si possible"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1917
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "N辿cessite TLS"
+
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Force old (port 5223) SSL"
-msgstr "Forcer l'ancien SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "Forcer l'ancien SSL (port 5223)"
+
+#: ../src/protocols/jabber/jabber.c:1925
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Autoriser l'authentication en clair pour les flux crypt辿s"
-
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
+msgstr "Autoriser l'authentification en clair pour les flux crypt辿s"
+
+#: ../src/protocols/jabber/jabber.c:1930 ../src/protocols/simple/simple.c:1669
 msgid "Connect port"
-msgstr "Connecter"
+msgstr "Port de connexion"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1934 ../src/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Connexion au serveur"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Message de %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a chang辿 le sujet en�: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "Le sujet est�: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "�chec de la livraison du message pour %s�: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Erreur message Jabber"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s veut ajouter %s � sa liste de contacts"
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Autoriser"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "Refuser"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
+#: ../src/protocols/oscar/oscar.c:7405
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
+#: ../src/protocols/oscar/oscar.c:7406
+msgid "_Deny"
+msgstr "_Refuser"
+
+#: ../src/protocols/jabber/presence.c:376
+#: ../src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Cr辿er un nouveau salon"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6534,41 +7402,41 @@
 "Vous cr辿ez un nouveau salon. Voulez-vous choisir ses param竪tres ou utiliser "
 "ceux par d辿faut�?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Configurer le salon"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Param竪tres par d辿faut"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:380
+msgid "_Configure Room"
+msgstr "_Configurer le salon"
+
+#: ../src/protocols/jabber/presence.c:382
+msgid "_Accept Defaults"
+msgstr "_Accepter les param竪tres par d辿faut"
+
+#: ../src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erreur dans la discussion %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arriv辿e dans la discussion %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:726
 #, 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:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "�chec d'envoi de fichier"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Probl竪me de synchronisation de la liste de contact avec %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6577,7 +7445,7 @@
 "%s est dans le groupe 束�%s�損 sur la liste locale mais pas pas sur le "
 "serveur. Voulez-vous ajouter ce contact�?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6586,263 +7454,263 @@
 "%s est sur la liste locale mais pas pas sur le serveur. Voulez-vous ajouter "
 "ce contact�?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
-msgstr "Impossible d'interpr棚ter le message"
-
-#: src/protocols/msn/error.c:38
+msgstr "Impossible d'interpr辿ter le message"
+
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Erreur de syntaxe (probablement un bug de Gaim)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Adresse de courrier 辿lectronique non valide"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Cet utilisateur n'existe pas"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Adresse internet incompl竪te"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "D辿j� connect辿"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Nom d'utilisateur non valide"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Alias non valide"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Liste pleine"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "D辿j� dans la liste"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "L'utilisateur est d辿connect辿"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "D辿j� dans ce mode"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "D辿j� dans la liste oppos辿e"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Trop de groupes"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Groupe non valide"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Utilisateur inconnu dans ce groupe"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Nom du groupe trop long"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Impossible de supprimer le groupe z辿ro"
 
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Impossible d'ajouter un contact inexistant"
-
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:95
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Impossible d'ajouter un contact � un groupe inexistant"
+
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "�chec du standardiste"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Notification de transfert 辿chou辿"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Remplissez les champs requis"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Trop de r辿ponses sur un FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "Non connect辿"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Service temporairement indisponible"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Erreur de base de donn辿es du serveur"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Commande d辿sactiv辿e"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Erreur de manipulation de fichier"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Erreur d'allocation m辿moire"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Valeur CHL envoy辿e au serveur incorrecte"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Serveur occup辿"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Serveur non disponible"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Notification du serveur distant est coup辿"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Erreur de connexion � la base de donn辿es"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Le serveur va 棚tre coup辿 (abandonnez le navire)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Erreur � l'ouverture de la connexion"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Les param竪tres CVR sont inconnus ou interdits"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Impossible d'辿crire"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Surcharge de session"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "L'utilisateur est trop actif"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Trop de sessions"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Compte Passeport non v辿rifi辿"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Mauvais fichier d'ami"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Non attendu"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Le pseudonyme change trop rapidement"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Serveur occup辿"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "�chec de l'authentification"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Interdit en dehors de la connexion"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "N'accepte plus de nouveaux utilisateurs"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Passeport pour enfant sans accord parental"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Le compte Passeport n'est pas encore valid辿"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Mauvais ticket"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Code d'erreur inconnu %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN�: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: src/protocols/msn/msn.c:138
+msgstr "On vient de vous donner un 束�coup de coude.�損"
+
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 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:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Num辿ro de t辿l辿phone"
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Num辿ro de t辿l辿phone au travail"
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Num辿ro de t辿l辿phone portable"
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Autoriser les messages MSN vers votre t辿l辿phone portable�?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6850,29 +7718,29 @@
 "Voulez-vous autorisez les contacts de votre liste � vous envoyer des "
 "messages MSN sur votre t辿l辿phone portable�?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Interdire"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: src/protocols/msn/msn.c:354
+msgstr "Ce compte Hotmail ne semble pas 棚tre actif."
+
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un t辿l辿phone portable"
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Bipper"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2886
 #, c-format
 msgid ""
 "\n"
@@ -6881,67 +7749,69 @@
 "\n"
 "<b>%s�:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "Vous 棚tes dans sa liste"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3288
 msgid "Be Right Back"
 msgstr "Revient de suite"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3291
+msgid "Busy"
+msgstr "Occup辿"
+
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3303
+msgid "On the Phone"
 msgstr "Au t辿l辿phone"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3309
+msgid "Out to Lunch"
 msgstr "Parti manger"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Cach辿"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "Changer l'alias"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Num辿ro de t辿l辿phone"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Num辿ro au travail"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Num辿ro de t辿l辿phone portable"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Activation du service pour t辿l辿phones portables"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Autorisation pour les messages sur t辿l辿phones portables"
-
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:623
+msgid "Set Friendly Name..."
+msgstr "Changer l'alias..."
+
+#: ../src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "Changer le num辿ro de t辿l辿phone..."
+
+#: ../src/protocols/msn/msn.c:632
+msgid "Set Work Phone Number..."
+msgstr "Changer le num辿ro au travail..."
+
+#: ../src/protocols/msn/msn.c:636
+msgid "Set Mobile Phone Number..."
+msgstr "Changer le num辿ro de t辿l辿phone portable..."
+
+#: ../src/protocols/msn/msn.c:642
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Activer le service pour t辿l辿phones portables..."
+
+#: ../src/protocols/msn/msn.c:647
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Autoriser les messages sur t辿l辿phones portables..."
+
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "Ouvrir la bo樽te au lettre Hotmail"
+
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "Envoyer vers un t辿l辿phone portable"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "Lancer une _discussion"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:729
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6950,89 +7820,84 @@
 "biblioth竪que SSL. Visitez http://gaim.sf.net/faq-ssl.php pour plus "
 "d'informations."
 
-#: src/protocols/msn/msn.c:745
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "Impossible de se connecter au serveur"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias�:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1035
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s�:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Erreur � la r辿cup辿ration du profil"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "�ge"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Genre"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Marital Status"
-msgstr "Status marital"
-
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+msgstr "�tat matrimonial"
+
+#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
 msgid "Location"
 msgstr "Localisation"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1607
 msgid "A Little About Me"
 msgstr "� propos de moi"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
 msgid "Favorite Things"
 msgstr "Choses pr辿f辿r辿es"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1658
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et int辿r棚ts"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "Citation pr辿f辿r辿e"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1681
 msgid "Last Updated"
 msgstr "Derni竪re mise � jour"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Page web"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1714
 msgid "The user has not created a public profile."
 msgstr "L'utilisateur n'a pas cr辿辿 de profil public"
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1715
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7041,7 +7906,7 @@
 "Impossible de r辿cup辿rer le profil de l'utilisateur par MSN. Soit "
 "l'utilisateur n'existe pas, soit il n'a pas cr辿辿 de profil public."
 
-#: src/protocols/msn/msn.c:1734
+#: ../src/protocols/msn/msn.c:1719
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7049,7 +7914,7 @@
 "Impossible de r辿cup辿rer des informations sur le profil de l'utilisateur. Il "
 "est possible que cet utilisateur n'existe pas."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "Lien du profil"
 
@@ -7063,77 +7928,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:1931 ../src/protocols/msn/msn.c:1933
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:1952
 msgid "Login server"
 msgstr "Serveur de connexion"
 
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:1961
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
-msgstr "buzz�: Faire sonner chez un contact pour attirer son attention"
-
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/msn.c:1966
+msgid "Show custom smileys"
+msgstr "Afficher les frimousses personnalis辿es"
+
+#: ../src/protocols/msn/msn.c:1974
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+"nudge�: donner un coup de coude � un contact pour attirer son attention."
+
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s n'est pas un nom de groupe valide"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Erreur inconnue"
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s pour %s (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Impossible d'ajouter l'utilisateur � la liste de %s (%s)"
 
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
 
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s n'est pas un compte passeport valide."
 
-#: src/protocols/msn/notification.c:815
+#: ../src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Service temporairement indisponible."
+
+#: ../src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Impossible de renommer le groupe"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7162,204 +8036,215 @@
 "\n"
 "Une fois la maintenance effectu辿e, vous pourrez vous reconnecter."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Erreur d'辿criture"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: ../src/protocols/msn/servconn.c:144
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Erreur de connexion du serveur 束�%s�損 (%s)�:\n"
+"Erreur de connexion du serveur %s�:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Notre protocole n'est pas support辿s par le serveur."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Erreur � l'analyse du HTTP"
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Vous venez de vous connecter depuis un autre endroit."
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Les serveurs MSN ne sont pas disponibles pour l'instant. Veuillez attendre "
 "un peu puis r辿essayer."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Les serveurs MSN sont coup辿s temporairement."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Impossible de s'authentifier�: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Votre liste de contacts MSN n'est pas disponible pour l'instant. Veuillez "
 "attendre un peu puis r辿essayer."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Poign辿e de main"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Transfert"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "D辿but d'authentification"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "R辿cup辿ration du cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Envoi du cookie"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "R辿cup辿ration de la liste de contacts"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Absent"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Au t辿l辿phone"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Parti manger"
+
+#: ../src/protocols/msn/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Le message peut ne pas avoir 辿t辿 envoy辿 � cause d'un temps mort�:"
 
-#: src/protocols/msn/switchboard.c:411
+#: ../src/protocols/msn/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Impossible d'envoyer un message en 辿tant invisible�:"
 
-#: src/protocols/msn/switchboard.c:415
+#: ../src/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Impossible d'envoyer le message � un utilisateur d辿connect辿�:"
 
-#: src/protocols/msn/switchboard.c:419
+#: ../src/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Impossible d'envoyer le message � cause d'un probl竪me de connexion�:"
 
-#: src/protocols/msn/switchboard.c:423
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+"Impossible d'envoyer le message parce que la vitesse maximale est d辿pass辿e�:"
+
+#: ../src/protocols/msn/switchboard.c:432
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Impossible d'envoyer le message � cause d'une erreur du serveur "
 "standardiste�:"
 
-#: src/protocols/msn/switchboard.c:431
+#: ../src/protocols/msn/switchboard.c:440
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message � cause d'une erreur inconnue�:"
 
-#: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+#: ../src/protocols/msn/switchboard.c:961
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s veut vous envoyer un fichier"
-
-#: src/protocols/msn/userlist.c:85
+msgstr "%s vient de vous donner un 束�coup de coude.�損"
+
+#: ../src/protocols/msn/userlist.c:96
 #, 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/userlist.c:275
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "L'utilisateur %s veut ajouter %s � sa liste de contacts"
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+msgid "Authorize"
+msgstr "Autoriser"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+msgid "Deny"
+msgstr "Refuser"
+
+#: ../src/protocols/msn/userlist.c:286
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "L'utilisateur %s vous � ajout辿 � sa liste de contacts."
+
+#: ../src/protocols/msn/userlist.c:350
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "L'utilisateur %s vous � enlev辿 de sa liste de contacts."
+
+#: ../src/protocols/msn/userlist.c:678
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Impossible d'ajouter 束�%s�損"
 
-#: src/protocols/msn/userlist.c:661
+#: ../src/protocols/msn/userlist.c:680
 msgid "The screen name specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
 
-#: src/protocols/napster/napster.c:260
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Impossible de lire l'ent棚te depuis le serveur"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Impossible de lire le message depuis le serveur�: %s. La commande est %hd, "
 "sa longueur est %hd."
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
 msgstr "Erreur inconnue"
 
-#: src/protocols/napster/napster.c:339
+#: ../src/protocols/napster/napster.c:345
 #, 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:350
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Impossible d'ajouter 束�%s�損 � vos favoris Napster"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Vous avez 辿t辿 d辿connect辿 du serveur"
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s a demand辿 vos informations"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s a demand辿 un PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "Impossible de se connecter"
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Groupe�:"
 
@@ -7373,91 +8258,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:700
+#: ../src/protocols/napster/napster.c:702
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin pour le protocole NAPSTER"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Les param竪tres n辿cessaires n'ont pas 辿t辿 pass辿s"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Impossible d'辿crire sur le r辿seau"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Impossible de lire depuis le r辿seau"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Erreur de communication avec le serveur"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Conf辿rence non trouv辿e"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Cette conf辿rence n'existe pas"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Un dossier avec ce nom existe d辿j�"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Non support辿"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Le mot de passe a expir辿"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Mot de passe non valide"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Utilisateur non trouv辿"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Le compt辿 a 辿t辿 d辿sactiv辿"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Le serveur ne peut pas acc辿der � l'annuaire"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Votre administrateur a d辿sactiv辿 cette commande"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Le serveur est non disponible. Veuillez r辿essayer plus tard."
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 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:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Impossible de s'ajouter en tant que contact"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "L'archive principale est mal configur辿e"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Nom d'utilisateur ou mot de passe non valide"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 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:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7465,31 +8351,31 @@
 "Votre compte a 辿t辿 d辿sactiv辿 � cause d'un trop grand nombre de mots de passe "
 "saisis incorrects."
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 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:1939
+#: ../src/protocols/novell/nmuser.c:1939
 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:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Nom d'utilisateur saisi non valide"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Erreur lors de la mise � jour de l'annuaire"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Version du protocole incompatible"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "L'utilisateur vous a bloqu辿"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7497,56 +8383,56 @@
 "Cette version d'辿valuation n'autorise pas plus de dix utilisateurs connect辿s "
 "� un instant."
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "L'utilisateur est d辿connect辿 ou vous bloque"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue�:0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�chec � la connexion (%s)"
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Impossible d'envoyer le message. Impossible de r辿cup辿rer des informations "
 "sur l'utilisateur (%s)."
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Impossible d'ajouter %s � la liste de contacts (%s)"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Impossible d'envoyer le message (%s)"
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Impossible d'inviter l'utilisateur (%s)"
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Impossible d'envoyer le message � %s. Impossible de cr辿er la conf辿rence (%s)"
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Impossible d'envoyer le message. Impossible de cr辿er la conf辿rence (%s)"
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7555,7 +8441,7 @@
 "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:617
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7564,67 +8450,67 @@
 "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:690
+#: ../src/protocols/novell/novell.c:705
 #, 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:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Impossible d'ajouter l'utilisateur � la liste de filtre (%s)"
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Impossible d'ajouter %s � la liste d'interdiction (%s)"
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Impossible d'ajouter %s � la liste d'autorisation (%s)"
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossible de supprimer %s de la liste de filtre (%s)"
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossible de changer la configuration du filtre sur le serveur (%s)"
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Impossible de cr辿er la conf辿rence (%s)"
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Erreur de communication avec le serveur. Fermeture de la connexion."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "T辿l辿phone"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Service"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Titre"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Bo樽te aux lettres"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
+#: ../src/protocols/oscar/oscar.c:6120
 msgid "Email Address"
 msgstr "Adresse 辿lectronique"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID Utilisateur"
 
@@ -7635,46 +8521,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conf辿rence GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "Impossible de cr辿er une connexion SSL vers le serveur"
 
-#: src/protocols/novell/novell.c:1673
-#, 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:1707
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Authentification en cours..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "Impossible de se connecter au serveur"
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "En attente de r辿ponse..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1876
 #, 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:1885
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Invitation � la conversation"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7685,17 +8566,17 @@
 "\n"
 "Envoy辿�: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "Voulez-vous joindre la conversation�?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Vous venez d'棚tre d辿connect辿 � la suite d'une connexion depuis un autre "
 "endroit."
 
-#: src/protocols/novell/novell.c:2051
+#: ../src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7705,7 +8586,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7713,19 +8594,14 @@
 "Impossible de se connecter au serveur. Veuillez entrer l'adresse du serveur "
 "sur lequel vous voulez vous connecter."
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Support SSL non install辿"
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cette conf辿rence est ferm辿e. Aucun message ne peut 棚tre envoy辿."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "Invisible"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7736,115 +8612,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3544 ../src/protocols/novell/novell.c:3546
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin pour le protocole Novell GroupWise"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3565
 msgid "Server address"
 msgstr "H担te du serveur"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3569
 msgid "Server port"
 msgstr "Port du serveur"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "Erreur non valide"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "SNAC non valide"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "Fr辿quence vers l'h担te"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "Fr辿quence vers le client"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "Service non disponible"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:209
 msgid "Service not defined"
 msgstr "Service non d辿fini"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:210
 msgid "Obsolete SNAC"
 msgstr "SNAC obsol竪te"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "Non support辿 par l'h担te"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "Non support辿 par le client"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "Refus辿 par le client"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "R辿ponse trop grosse"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "R辿ponses perdues"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:216
 msgid "Request denied"
 msgstr "Requ棚te refus辿e"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:217
 msgid "Busted SNAC payload"
 msgstr "Charge SNAC incorrecte"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "Droits insuffisants"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "Dans l'autorisation/interdiction locale"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "Trop m辿chant (envoyeur)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "Trop m辿chant (destinataire)"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "L'utilisateur est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:223
 msgid "No match"
 msgstr "Aucun r辿sultat"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:224
 msgid "List overflow"
 msgstr "D辿passement de liste"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "Requ棚te ambigu谷"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "File d'attente pleine"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7852,158 +8728,158 @@
 "(Erreur de r辿ception du message. Votre interlocuteur a probablement un "
 "client d辿fectueux)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:638
 msgid "Voice"
 msgstr "Voix"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:641
 msgid "AIM Direct IM"
 msgstr "Connexion directe AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Discussion"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:654
 msgid "Games"
 msgstr "Jeux"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:657
 msgid "Add-Ins"
 msgstr "Modules"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:660
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:663
 msgid "ICQ Direct Connect"
 msgstr "Connexion directe ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:666
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:669
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:672
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:675
 msgid "ICQ Server Relay"
-msgstr "Relai de serveur ICQ"
-
-#: src/protocols/oscar/oscar.c:656
+msgstr "Relais de serveur ICQ"
+
+#: ../src/protocols/oscar/oscar.c:678
 msgid "Old ICQ UTF8"
 msgstr "Ancien ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:681
 msgid "Trillian Encryption"
 msgstr "Chiffrement Trillian"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:684
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Security Enabled"
 msgstr "S辿curit辿 activ辿e"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Video Chat"
 msgstr "Visioconf辿rence"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:697
 msgid "iChat AV"
 msgstr "Vid辿o iChat"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:700
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:703
 msgid "Camera"
-msgstr "Camera"
-
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+msgstr "Cam辿ra"
+
+#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
 msgid "Occupied"
 msgstr "Occup辿"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:731
 msgid "Web Aware"
 msgstr "Sur internet"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:735
+msgid "Online"
+msgstr "En ligne"
+
+#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Possibilit辿s"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:821
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#: src/protocols/oscar/oscar.c:958
+#: ../src/protocols/oscar/oscar.c:970
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Connexion directe avec %s ferm辿e"
 
-#: src/protocols/oscar/oscar.c:960
+#: ../src/protocols/oscar/oscar.c:972
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�chec de la connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:980
 msgid "Direct Connect failed"
 msgstr "�chec de la connexion directe"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Connexion directe avec %s 辿tablie"
 
-#: src/protocols/oscar/oscar.c:1126
+#: ../src/protocols/oscar/oscar.c:1141
 #, 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:1547
+#: ../src/protocols/oscar/oscar.c:1544
 #, 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:1552
+#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
 msgid "Unable to open Direct IM"
 msgstr "Impossible d'ouvrir une connexion directe"
 
-#: src/protocols/oscar/oscar.c:1587
+#: ../src/protocols/oscar/oscar.c:1632
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:1591
+#: ../src/protocols/oscar/oscar.c:1636
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8011,24 +8887,24 @@
 "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:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Connecter"
-
-#: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
+msgid "_Connect"
+msgstr "_Connecter"
+
+#: ../src/protocols/oscar/oscar.c:1718
+#, c-format
 msgid "You have lost your connection to chat room %s."
-msgstr "Vous avez 辿t辿 d辿connect辿 du salon %s"
-
-#: src/protocols/oscar/oscar.c:1684
+msgstr "Vous avez 辿t辿 d辿connect辿 du salon %s."
+
+#: ../src/protocols/oscar/oscar.c:1741
 msgid "Chat is currently unavailable"
 msgstr "Les discussions sont inaccessibles pour l'instant"
 
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:1813
 msgid "Screen name sent"
 msgstr "Pseudo envoy辿"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1829
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8039,73 +8915,82 @@
 "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:1799
+#: ../src/protocols/oscar/oscar.c:1857
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter � AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
 msgid "Could Not Connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/oscar/oscar.c:1911
+#: ../src/protocols/oscar/oscar.c:1971
 msgid "Connection established, cookie sent"
 msgstr "Connexion 辿tablie, cookie envoy辿"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2130
 msgid "Attempting connection redirect..."
-msgstr "Tentative de connexion directe pour message vers %s � %s:%hu"
+msgstr "Tentative de redirection de connexion..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2176
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
+msgstr ""
+"Le transfert du fichier 束�%s�損 est mort.\n"
+"Essayez de configurer les serveurs mandataires pour les transferts de "
+"fichiers dans Comptes->%s->Modifier le compte->Avanc辿."
+
+#: ../src/protocols/oscar/oscar.c:2274
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de cr辿er un descripteur de fichier"
 
-#: src/protocols/oscar/oscar.c:2211
+#: ../src/protocols/oscar/oscar.c:2279
 msgid "Unable to create new connection."
 msgstr "Impossible de cr辿er une nouvelle connexion"
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
+#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
 msgid "Unable to log into file transfer proxy."
-msgstr "Impossible d'辿crire dans le fichier %s"
-
-#: src/protocols/oscar/oscar.c:2532
-#, fuzzy
+msgstr ""
+"Impossible de se connecter au serveur mandataire pour les transferts de "
+"fichiers."
+
+#: ../src/protocols/oscar/oscar.c:2603
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Impossible d'ouvrir le socket en attente de connexions"
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr ""
+"Impossible d'ouvrir le socket en attente de connexions ou pas de connexion "
+"mandataire AOL."
+
+#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou mot de passe incorrect."
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:2846
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2850
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:2855
 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."
@@ -8114,35 +8999,35 @@
 "r辿essayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: src/protocols/oscar/oscar.c:2752
+#: ../src/protocols/oscar/oscar.c:2860
 #, 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:2783
+#: ../src/protocols/oscar/oscar.c:2888
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:2958
 msgid "Received authorization"
 msgstr "Autorisation re巽ue"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:2982
 msgid "The SecurID key entered is invalid."
-msgstr "La clef SecurID saisie est non valide."
-
-#: src/protocols/oscar/oscar.c:2891
+msgstr "La cl辿 SecurID saisie est non valide."
+
+#: ../src/protocols/oscar/oscar.c:2996
 msgid "Enter SecurID"
 msgstr "Saisissez votre SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:2997
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Saisissez les 6 chiffres de l'affichage num辿rique"
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
+#: ../src/protocols/oscar/oscar.c:3158
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8151,24 +9036,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:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
 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:3054
+#: ../src/protocols/oscar/oscar.c:3161
 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:3085
+#: ../src/protocols/oscar/oscar.c:3182
 msgid "Password sent"
 msgstr "Mot de passe envoy辿"
 
-#: src/protocols/oscar/oscar.c:4352
+#: ../src/protocols/oscar/oscar.c:4490
 #, 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:4355
+#: ../src/protocols/oscar/oscar.c:4493
 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 "
@@ -8178,19 +9063,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:4394
+#: ../src/protocols/oscar/oscar.c:4532
 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:4402
+#: ../src/protocols/oscar/oscar.c:4540
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation�:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4541
 msgid "Please authorize me!"
 msgstr "Autorise-moi, s'il te pla樽t�!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8199,35 +9084,39 @@
 "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:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:4576
 msgid "Request Authorization"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:4578
+msgid "_Request Authorization"
+msgstr "_Demande d'autorisation"
+
+#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:4621
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation�:"
 
-#: src/protocols/oscar/oscar.c:4590
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:4728
+#, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"L'utilisateur %u veut vous ajouter � sa liste de contacts pour la raison "
+"L'utilisateur %u veut ajouter %s � sa liste de contacts pour la raison "
 "suivante�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:4750
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8238,19 +9127,19 @@
 "contacts pour la raison suivante�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: ../src/protocols/oscar/oscar.c:4751
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refus辿e"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:4758
 #, 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:4628
+#: ../src/protocols/oscar/oscar.c:4766
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8263,7 +9152,7 @@
 "De�: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:4774
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8276,7 +9165,7 @@
 "De�: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8289,20 +9178,20 @@
 "Le message est�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4803
 #, 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:4671
+#: ../src/protocols/oscar/oscar.c:4809
 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:4675
-msgid "Decline"
-msgstr "D辿cliner"
-
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:4813
+msgid "_Decline"
+msgstr "_D辿cliner"
+
+#: ../src/protocols/oscar/oscar.c:4897
 #, 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."
@@ -8310,7 +9199,7 @@
 msgstr[1] ""
 "Vous avez rat辿 %hu messages de %s car les messages 辿taient non valides."
 
-#: src/protocols/oscar/oscar.c:4768
+#: ../src/protocols/oscar/oscar.c:4906
 #, 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."
@@ -8318,7 +9207,7 @@
 msgstr[1] ""
 "Vous avez rat辿 %hu messages de %s car les messages 辿taient trop gros."
 
-#: src/protocols/oscar/oscar.c:4777
+#: ../src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8328,77 +9217,87 @@
 msgstr[1] ""
 "Vous avez rat辿 %hu messages de %s car le quota limite a 辿t辿 d辿pass辿."
 
-#: src/protocols/oscar/oscar.c:4786
+#: ../src/protocols/oscar/oscar.c:4924
 #, 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:4795
+#: ../src/protocols/oscar/oscar.c:4933
 #, 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:4804
+#: ../src/protocols/oscar/oscar.c:4942
 #, 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:4863
+#: ../src/protocols/oscar/oscar.c:5001
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN�:</B> %s<BR><B>Status�:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:4924
+msgstr "<B>UIN�:</B> %s<BR><B>�tat�:</B> %s<HR>%s"
+
+#: ../src/protocols/oscar/oscar.c:5062
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a envoy辿 l'erreur�: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:5099
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message�: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
 msgid "Unknown reason."
 msgstr "Erreur inconnue"
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s�:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: ../src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "User information not available: %s"
 msgstr "Les informations ne sont pas disponibles�: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Les informations de %s ne sont pas disponibles�:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: ../src/protocols/oscar/oscar.c:5192
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:5197
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:5202
+msgid "Capabilities"
+msgstr "Possibilit辿s"
+
+#: ../src/protocols/oscar/oscar.c:5220
+msgid "Available Message"
+msgstr "Message de disponibilit辿"
+
+#: ../src/protocols/oscar/oscar.c:5337
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'棚tre coup辿e"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: ../src/protocols/oscar/oscar.c:5523
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8406,117 +9305,106 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caract竪res non valides.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5744
 msgid "Rate limiting error."
 msgstr "Erreur de limite de quota"
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:5745
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"La derni竪re action n'a pas pu 棚tre effectu辿e car vous avez depass辿 le quota "
+"La derni竪re action n'a pas pu 棚tre effectu辿e car vous avez d辿pass辿 le quota "
 "limite. Veuillez attendre 10 secondes et r辿essayer."
 
-#: src/protocols/oscar/oscar.c:5631
+#: ../src/protocols/oscar/oscar.c:5818
 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:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez 辿t辿 d辿connect辿 du salon %s"
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Num辿ro de t辿l辿phone portable"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Femme"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Homme"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:6142
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:6146
 msgid "Additional Information"
 msgstr "Informations suppl辿mentaires"
 
-#: src/protocols/oscar/oscar.c:6004
+#: ../src/protocols/oscar/oscar.c:6151
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/oscar/oscar.c:6159
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6167
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6168
 msgid "Company"
 msgstr "Soci辿t辿"
 
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:6169
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:6170
 msgid "Position"
 msgstr "Poste"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "Web Page"
 msgstr "Page web"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Pop-Up Message"
 msgstr "Message en fen棚tre"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, 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:6140
+#: ../src/protocols/oscar/oscar.c:6270
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "Le pseudonyme suivant est associ辿 a %s"
+msgstr[1] "Les pseudonymes suivants sont associ辿s a %s"
+
+#: ../src/protocols/oscar/oscar.c:6301
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Aucun r辿sultat pour l'adresse 辿lectronique %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/oscar/oscar.c:6322
 #, 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:6163
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demand辿e"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:6355
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8525,14 +9413,14 @@
 "Erreur 0x%04x�: Impossible d'afficher le pseudo parce que la version "
 "demand辿e diff竪re de l'originale."
 
-#: src/protocols/oscar/oscar.c:6200
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:6361
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
-"Erreur 0x%04x�: Impossible d'afficher le pseudo parce que la version "
-"demand辿e est trop longue"
-
-#: src/protocols/oscar/oscar.c:6203
+"Erreur 0x%04x�: Impossible d'afficher le pseudonyme parce qu'il est non "
+"valide."
+
+#: ../src/protocols/oscar/oscar.c:6364
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8541,7 +9429,7 @@
 "Erreur 0x%04x�: Impossible d'afficher le pseudo parce que la version "
 "demand辿e est trop longue"
 
-#: src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8550,7 +9438,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:6209
+#: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8559,7 +9447,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:6212
+#: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8568,12 +9456,12 @@
 "Erreur 0x%04x�: Impossible de changer l'adresse 辿lectronique parce qu'elle "
 "est non valide."
 
-#: src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6376
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x�: Erreur inconnue."
 
-#: src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:6386
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8582,27 +9470,27 @@
 "Votre pseudo est actuellement affich辿 comme cela�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adresse 辿lectronique de %s est %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:6464
 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:6480
+#: ../src/protocols/oscar/oscar.c:6704
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:6705
 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 "
@@ -8612,7 +9500,7 @@
 "connexion. Le profil n'a pas 辿t辿 chang辿. R辿essayez une fois la connexion "
 "compl竪te."
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6719
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8627,11 +9515,11 @@
 "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:6500
+#: ../src/protocols/oscar/oscar.c:6724
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:6766
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8646,25 +9534,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:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:6771
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Impossible de mettre le message d'absence AIM"
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Il est impossible de changer le message d'absence pendant la proc辿dure de "
-"connexion. Vous 棚tes toujours 束�En ligne.�損 R辿essayez une fois la connexion "
-"compl竪te."
-
-#: src/protocols/oscar/oscar.c:6691
+#: ../src/protocols/oscar/oscar.c:6840
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8676,16 +9550,16 @@
 "uniquement des lettres, des chiffres et des espaces, soit contenir "
 "uniquement des chiffres."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
+#: ../src/protocols/oscar/oscar.c:7263
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:6949
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de r辿cup辿rer la liste de contacts"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:6950
 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 "
@@ -8694,13 +9568,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:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
+#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
+#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:7247
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8709,11 +9583,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:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7261
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8724,7 +9598,7 @@
 "plus probable est que le nombre maximum de contact a 辿t辿 atteint dans votre "
 "liste de contacts."
 
-#: src/protocols/oscar/oscar.c:7187
+#: ../src/protocols/oscar/oscar.c:7344
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8733,34 +9607,34 @@
 "L'utilisateur %s vous a autoris辿 � l'ajouter � votre liste de contacts. "
 "Voulez-vous le faire�?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: ../src/protocols/oscar/oscar.c:7350
 msgid "Authorization Given"
 msgstr "Autorisation donn辿e"
 
-#: src/protocols/oscar/oscar.c:7237
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:7394
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"L'utilisateur %s veut vous ajouter � sa liste de contacts pour la raison "
+"L'utilisateur %s veut ajouter %s � sa liste de contacts pour la raison "
 "suivante�:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:7439
 #, 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:7283
+#: ../src/protocols/oscar/oscar.c:7440
 msgid "Authorization Granted"
 msgstr "Autorisation accord辿e"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:7443
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8771,100 +9645,92 @@
 "contacts pour la raison suivante�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:7444
 msgid "Authorization Denied"
 msgstr "Autorisation refus辿e"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Echange�:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussion non valide"
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:7587
 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:7565
-msgid "Away Message"
-msgstr "Message d'absence"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:7742
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(en cours de r辿cup辿ration)</i>"
+
+#: ../src/protocols/oscar/oscar.c:8048
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:8049
 msgid "Buddy Comment:"
 msgstr "Commentaire�:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: ../src/protocols/oscar/oscar.c:8068
 msgid "Edit Buddy Comment"
 msgstr "�diter le commentaire"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:8075
 msgid "Get Status Msg"
-msgstr "Obtenir le status"
-
-#: src/protocols/oscar/oscar.c:7892
+msgstr "Obtenir le message d'辿tat"
+
+#: ../src/protocols/oscar/oscar.c:8088
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:8107
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8164
 msgid "Require authorization"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
-msgid "Hide IP address"
-msgstr "Adresse IP"
-
-#: src/protocols/oscar/oscar.c:7975
-#, fuzzy
-msgid "Web aware"
-msgstr "Sur internet"
-
-#: src/protocols/oscar/oscar.c:7980
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8167
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Sur le web (activer ceci vous fera recevoir du pourriel�!)"
+
+#: ../src/protocols/oscar/oscar.c:8172
 msgid "ICQ Privacy Options"
-msgstr "Options du serveur mandataire"
-
-#: src/protocols/oscar/oscar.c:7997
+msgstr "Options de confidentialit辿 ICQ"
+
+#: ../src/protocols/oscar/oscar.c:8189
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:8190
 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:8005
+#: ../src/protocols/oscar/oscar.c:8197
 msgid "New screen name formatting:"
 msgstr "Nouvel affichage pour le pseudo�:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: ../src/protocols/oscar/oscar.c:8249
 msgid "Change Address To:"
 msgstr "Nouvelle adresse�:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: ../src/protocols/oscar/oscar.c:8294
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:8297
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: src/protocols/oscar/oscar.c:8106
+#: ../src/protocols/oscar/oscar.c:8298
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8872,86 +9738,76 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "束�Redemander autorisation�損 sur un clic-droit du contact."
 
-#: src/protocols/oscar/oscar.c:8123
+#: ../src/protocols/oscar/oscar.c:8315
 msgid "Find Buddy by E-mail"
 msgstr "Chercher un contact par adresse 辿lectronique"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8316
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse 辿lectronique"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:8317
 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:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "�diter les informations..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:8410
 msgid "Set User Info (URL)..."
 msgstr "�diter les informations (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Changer de mot de passe..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:8421
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:8425
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "Afficher plus d'options"
+#: ../src/protocols/oscar/oscar.c:8435
+msgid "Set Privacy Options..."
+msgstr "Changer les options de confidentialit辿..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:8442
 msgid "Format Screen Name..."
 msgstr "Changer l'affichage du pseudo..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8446
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: src/protocols/oscar/oscar.c:8258
+#: ../src/protocols/oscar/oscar.c:8450
 msgid "Display Currently Registered Address"
 msgstr "Afficher l'adresse enregistr辿e"
 
-#: src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8454
 msgid "Change Currently Registered Address..."
 msgstr "Changer l'adresse enregistr辿e..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:8461
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8467
 msgid "Search for Buddy by Email..."
 msgstr "Chercher par adresse 辿lectronique..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:8472
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'apr竪s les informations..."
 
-#: src/protocols/oscar/oscar.c:8350
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8539
 msgid "Use recent buddies group"
-msgstr "Utilisateur inconnu dans ce groupe"
-
-#: src/protocols/oscar/oscar.c:8353
-#, fuzzy
+msgstr "Utiliser le groupe de contacts r辿cents"
+
+#: ../src/protocols/oscar/oscar.c:8542
 msgid "Show how long you have been idle"
-msgstr "Permet de changer manuellement le temps d'inactivit辿"
-
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
+msgstr "Afficher temps d'inactivit辿"
+
+#: ../src/protocols/oscar/oscar.c:8551
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr ""
+"Utiliser le serveur mandataire AIM/ICQ (plus lent mais fonctionne souvent)"
 
 #. *< type
 #. *< ui_requirement
@@ -8963,290 +9819,672 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8684 ../src/protocols/oscar/oscar.c:8686
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin pour le protocole AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: ../src/protocols/oscar/oscar.c:8705
 msgid "Auth host"
 msgstr "H担te d'authentification"
 
-#: src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:8708
 msgid "Auth port"
 msgstr "Port d'authentification"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:8711 ../src/protocols/zephyr/zephyr.c:2901
 msgid "Encoding"
 msgstr "Codage"
 
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8715
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+"Utiliser le serveur mandataire AIM/ICQ\n"
+"(plus lent mais fonctionne souvent)"
+
+#: ../src/protocols/sametime/sametime.c:415
+msgid "Connection closed (writing)"
+msgstr "Connexion termin辿e (en 辿criture)"
+
+#: ../src/protocols/sametime/sametime.c:1267
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Titre du groupe�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1268
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Id Notes du groupe�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1270
+#, c-format
+msgid "Info for Group %s"
+msgstr "Informations pour le groupe %s"
+
+#: ../src/protocols/sametime/sametime.c:1272
+msgid "Notes Address Book Information"
+msgstr "Informations du carnet d'adresses Notes"
+
+#: ../src/protocols/sametime/sametime.c:1304
+msgid "Invite Group to Conference..."
+msgstr "Inviter le groupe � une conf辿rence..."
+
+#: ../src/protocols/sametime/sametime.c:1314
+msgid "Get Notes Address Book Info"
+msgstr "R辿cup辿rer les informations du carnet d'adresses Notes"
+
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
-msgstr "Envoi du cookie"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+msgstr "Envoi de la poign辿e de main"
+
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "En attente de d辿but de transfert"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "En attente de r辿ception de la poign辿e de main"
+
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "Poign辿e de main accept辿e. Envoi du nom d'utilisateur."
+
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+msgstr "En attente de r辿ception des informations utilisateurs."
+
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
-msgstr "Serveur de connexion"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "Connexion redirig辿e"
+
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
 msgstr "Connexion"
 
-#: src/protocols/sametime/sametime.c:1163
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "Connexion au serveur SILC"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Actif"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Impossible de cr辿er le socket"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Les surnoms IRC ne peuvent pas avoir d'espace"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin pour le protocole SILC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin pour le protocole SILC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "ID Utilisateur"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "Pas de serveur mandataire"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "Pas de serveur mandataire"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+msgstr "Connexion re巽ue"
+
+#: ../src/protocols/sametime/sametime.c:1502
+msgid "Starting Services"
+msgstr "D辿marrage des services"
+
+#: ../src/protocols/sametime/sametime.c:1507
+msgid "Connected"
+msgstr "Connect辿"
+
+#: ../src/protocols/sametime/sametime.c:1605
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"Un administrateur Sametime a lanc辿 l'annonce suivante sur le serveur %s."
+
+#: ../src/protocols/sametime/sametime.c:1610
+msgid "Sametime Administrator Announcement"
+msgstr "Annonce d'un administrateur Sametime"
+
+#: ../src/protocols/sametime/sametime.c:1662
+msgid "Connection reset"
+msgstr "Connexion remise � z辿ro"
+
+#: ../src/protocols/sametime/sametime.c:1669
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Erreur � la lecture du socket�: %s"
+
+#. this is a regular connect, error out
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
+msgid "Unable to connect to host"
+msgstr "Impossible de se connecter � l'h担te"
+
+#: ../src/protocols/sametime/sametime.c:1736
+#, c-format
+msgid "Announcement from %s"
+msgstr "Annonce de %s"
+
+#: ../src/protocols/sametime/sametime.c:1910
+msgid "Conference Closed"
+msgstr "Conf辿rence ferm辿e"
+
+#: ../src/protocols/sametime/sametime.c:2367
+msgid "Unable to send message: "
+msgstr "Impossible d'envoyer le message�: "
+
+#: ../src/protocols/sametime/sametime.c:2926
+msgid "Place Closed"
+msgstr "Endroit ferm辿"
+
+#: ../src/protocols/sametime/sametime.c:3217
+msgid "Microphone"
+msgstr "Microphone"
+
+#: ../src/protocols/sametime/sametime.c:3218
+msgid "Speakers"
+msgstr "Haut-parleurs"
+
+#: ../src/protocols/sametime/sametime.c:3219
+msgid "Video Camera"
+msgstr "Cam辿ra vid辿o"
+
+#: ../src/protocols/sametime/sametime.c:3223
+msgid "File Transfer"
+msgstr "Transfert de fichier"
+
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr ""
+"\n"
+"<b>Supporte�:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:3262
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>Utilisateur ext辿rieur</b>"
+
+#: ../src/protocols/sametime/sametime.c:3368
+msgid "Create conference with user"
+msgstr "Cr辿er une conf辿rence avec l'utilisateur"
+
+#: ../src/protocols/sametime/sametime.c:3369
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Saisissez un sujet pour la nouvelle conf辿rence, ainsi qu'un message "
+"d'invitation � envoyer � %s"
+
+#: ../src/protocols/sametime/sametime.c:3373
+msgid "New Conference"
+msgstr "Nouvelle conf辿rence"
+
+#: ../src/protocols/sametime/sametime.c:3375
+msgid "Create"
+msgstr "Cr辿er"
+
+#: ../src/protocols/sametime/sametime.c:3439
+msgid "Available Conferences"
+msgstr "Conf辿rences disponibles"
+
+#: ../src/protocols/sametime/sametime.c:3445
+msgid "Create New Conference..."
+msgstr "Cr辿er une nouvelle conf辿rence..."
+
+#: ../src/protocols/sametime/sametime.c:3452
+msgid "Invite user to a conference"
+msgstr "Inviter l'utilisateur � une conf辿rence"
+
+#: ../src/protocols/sametime/sametime.c:3453
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Choisissez une conf辿rence dans la lise ci-dessous pour y inviter "
+"l'utilisateur %s. Choisissez 束�Cr辿er une nouvelle conf辿rence�損 si vous "
+"d辿sirer cr辿er une nouvelle conf辿rence afin d'y inviter cet utilisateur."
+
+#: ../src/protocols/sametime/sametime.c:3458
+msgid "Invite to Conference"
+msgstr "Inviter � une conf辿rence"
+
+#: ../src/protocols/sametime/sametime.c:3460
+msgid "Invite"
+msgstr "Inviter"
+
+#: ../src/protocols/sametime/sametime.c:3548
+msgid "Invite to Conference..."
+msgstr "Inviter � une conf辿rence..."
+
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "Envoyer une proclamation TEST"
+
+#: ../src/protocols/sametime/sametime.c:3600
+msgid "No Sametime Community Server specified"
+msgstr "Aucun serveur communautaire Sametime n'a 辿t辿 sp辿cifi辿."
+
+#: ../src/protocols/sametime/sametime.c:3622
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Aucun h担te ou adresse IP n'a 辿t辿 configur辿e pour le compte Meanwhile %s. "
+"Veuillez en saisir un ci-dessous pour continuer la connexion."
+
+#: ../src/protocols/sametime/sametime.c:3627
+msgid "Meanwhile Connection Setup"
+msgstr "Configuration de la connexion Meanwhile"
+
+#: ../src/protocols/sametime/sametime.c:3628
+msgid "No Sametime Community Server Specified"
+msgstr "Aucun serveur communautaire Sametime n'a 辿t辿 sp辿cifi辿."
+
+#: ../src/protocols/sametime/sametime.c:3630
+msgid "Connect"
+msgstr "Connecter"
+
+#: ../src/protocols/sametime/sametime.c:4085
+msgid "<b>External User</b><br>"
+msgstr "<b>Utilisateur ext辿rieur</b><br>"
+
+#: ../src/protocols/sametime/sametime.c:4088
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>Identifiant de l'utilisateur�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4094
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Nom complet�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4100
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>Dernier client connu�:</b> "
+
+#: ../src/protocols/sametime/sametime.c:4108
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Inconnu (0x%04x)<br>"
+
+#: ../src/protocols/sametime/sametime.c:4115
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Supporte�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4121
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>�tat�:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5428
+msgid "User Name"
+msgstr "Nom d'utilisateur"
+
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5431
+msgid "Sametime ID"
+msgstr "Identifiant Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4291
+msgid "An ambiguous user ID was entered"
+msgstr "Un identifiant d'utilisateur ambigu a 辿t辿 saisi."
+
+#: ../src/protocols/sametime/sametime.c:4292
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"L'identifiant 束�%s�損 peut correspondre � chacun des utilisateurs suivants. "
+"Veuillez choisir dans cette liste l'utilisateur que vous voulez ajouter � "
+"votre liste de contacts."
+
+#: ../src/protocols/sametime/sametime.c:4297
+msgid "Select User"
+msgstr "Choisir l'utilisateur"
+
+#: ../src/protocols/sametime/sametime.c:4367
+msgid "Unable to add user: user not found"
+msgstr "Impossible d'ajouter cet utilisateur parce qu'il est introuvable."
+
+#: ../src/protocols/sametime/sametime.c:4369
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"L'identifiant 束�%s�損 ne correspond � aucun utilisateur dans la communaut辿 "
+"Sametime. Cette entr辿e a 辿t辿 retir辿e de votre liste de contacts."
+
+#: ../src/protocols/sametime/sametime.c:4374
+msgid "Unable to add user"
+msgstr "Impossible d'ajouter un utilisateur"
+
+#: ../src/protocols/sametime/sametime.c:4946
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Erreur � la lecture du fichier 束�%s�損�:\n"
+"%s\n"
+
+#: ../src/protocols/sametime/sametime.c:5078
+msgid "Remotely Stored Buddy List"
+msgstr "Liste de contacts stock辿e sur le serveur"
+
+#: ../src/protocols/sametime/sametime.c:5083
+msgid "Buddy List Storage Mode"
+msgstr "Mode de stockage de la liste de contacts"
+
+#: ../src/protocols/sametime/sametime.c:5086
+msgid "Local Buddy List Only"
+msgstr "Liste de contacts en local uniquement"
+
+#: ../src/protocols/sametime/sametime.c:5088
+msgid "Merge List from Server"
+msgstr "Fusionner avec la liste du serveur"
+
+#: ../src/protocols/sametime/sametime.c:5090
+msgid "Merge and Save List to Server"
+msgstr "Fusionner et envoyer la liste sur le serveur"
+
+#: ../src/protocols/sametime/sametime.c:5092
+msgid "Synchronize List with Server"
+msgstr "Synchroniser la liste avec le serveur"
+
+#: ../src/protocols/sametime/sametime.c:5141
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Importer la liste Sametime du compte %s"
+
+#: ../src/protocols/sametime/sametime.c:5180
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Exporter la liste Sametime du compte %s"
+
+#: ../src/protocols/sametime/sametime.c:5233
+msgid "Unable to add group: group exists"
+msgstr "Impossible d'ajouter ce groupe parce qu'il existe d辿j�."
+
+#: ../src/protocols/sametime/sametime.c:5234
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Un group nomm辿 束�%s�損 existe d辿j� dans votre liste de contacts."
+
+#: ../src/protocols/sametime/sametime.c:5237
+#: ../src/protocols/sametime/sametime.c:5366
+msgid "Unable to add group"
+msgstr "Impossible d'ajouter le groupe"
+
+#: ../src/protocols/sametime/sametime.c:5296
+msgid "Possible Matches"
+msgstr "Correspondances possibles"
+
+#: ../src/protocols/sametime/sametime.c:5312
+msgid "Notes Address Book group results"
+msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
+
+#: ../src/protocols/sametime/sametime.c:5313
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"L'identifiant 束�%s�損 peut correspondre � chacun des groupes du carnet "
+"d'adresses Notes suivants. Veuillez choisir dans cette liste le groupe que "
+"vous voulez ajouter � votre liste de contacts."
+
+#: ../src/protocols/sametime/sametime.c:5318
+msgid "Select Notes Address Book"
+msgstr "Choisissez le carnet d'adresses Notes"
+
+#: ../src/protocols/sametime/sametime.c:5360
+msgid "Unable to add group: group not found"
+msgstr "Impossible d'ajouter ce groupe parce qu'il n'existe pas."
+
+#: ../src/protocols/sametime/sametime.c:5362
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"L'identifiant 束�%s�損 ne correspond � aucun groupe du carnet d'adresses Notes."
+
+#: ../src/protocols/sametime/sametime.c:5403
+msgid "Notes Address Book Group"
+msgstr "Groupe du carnet d'adresses Notes"
+
+#: ../src/protocols/sametime/sametime.c:5404
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Saisissez le nom d'un groupe de carnet d'adresses Notes dans le champ ci-"
+"dessous pour ajouter le groupe et ses membres dans votre liste de contacts."
+
+#: ../src/protocols/sametime/sametime.c:5452
+#, c-format
+msgid "Search results for '%s'"
+msgstr "R辿sultats de la recherche sur 束�%s�損"
+
+#: ../src/protocols/sametime/sametime.c:5453
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"L'identifiant 束�%s�損 peut correspondre � chacun des utilisateurs suivants. "
+"Vous pouvez ajouter ces utilisateurs � votre liste de contacts ou leur "
+"envoyer un message avec les boutons ci-dessous."
+
+#: ../src/protocols/sametime/sametime.c:5485
+msgid "No matches"
+msgstr "Aucun r辿sultat"
+
+#: ../src/protocols/sametime/sametime.c:5486
+#, c-format
+msgid "The identifier '%s' did not match and users in your Sametime community."
+msgstr ""
+"L'identifiant 束�%s�損 ne correspond � aucun utilisateur de la communaut辿 "
+"Sametime."
+
+#: ../src/protocols/sametime/sametime.c:5490
+msgid "No Matches"
+msgstr "Aucun r辿sultat"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid "Search for a user"
+msgstr "Rechercher un utilisateur"
+
+#: ../src/protocols/sametime/sametime.c:5528
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Saisissez un nom ou un identifiant partiel ci-dessous pour rechercher des "
+"utilisateurs correspondants dans la communaut辿 Sametime."
+
+#: ../src/protocols/sametime/sametime.c:5531
+msgid "User Search"
+msgstr "Recherche d'utilisateurs"
+
+#: ../src/protocols/sametime/sametime.c:5543
+msgid "Import Sametime List..."
+msgstr "Importer une liste Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5547
+msgid "Export Sametime List..."
+msgstr "Exporter une liste Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5551
+msgid "Add Notes Address Book Group..."
+msgstr "Ajouter un groupe de carnet d'adresses Notes..."
+
+#: ../src/protocols/sametime/sametime.c:5555
+msgid "User Search..."
+msgstr "Recherche d'utilisateurs..."
+
+#: ../src/protocols/sametime/sametime.c:5652
+msgid "Force login (ignore server redirects)"
+msgstr "Forcer la connexion (ignorer les redirections du serveur)"
+
+#. pretend to be Sametime Connect
+#: ../src/protocols/sametime/sametime.c:5662
+msgid "Hide client identity"
+msgstr "Cacher l'identit辿 du client"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, 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:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "Accord de clef"
-
-#: src/protocols/silc/buddy.c:53
+msgstr "Accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "Impossible d'effectuer l'accord de clef"
-
-#: src/protocols/silc/buddy.c:115
+msgstr "Impossible d'effectuer l'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "Erreur pendant l'accord de clef"
-
-#: src/protocols/silc/buddy.c:119
+msgstr "Erreur pendant l'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "�chec de l'accord de clef"
-
-#: src/protocols/silc/buddy.c:124
+msgstr "�chec de l'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "Connexion morte pendant l'accord de clef"
-
-#: src/protocols/silc/buddy.c:129
+msgstr "Connexion morte pendant l'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "Annulation de l'accord de clef"
-
-#: src/protocols/silc/buddy.c:134
+msgstr "Annulation de l'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "Accord de clef d辿ja commenc辿"
-
-#: src/protocols/silc/buddy.c:139
+msgstr "Accord de cl辿 d辿j� commenc辿"
+
+#: ../src/protocols/silc/buddy.c:140
 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:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+msgstr "L'accord de cl辿 ne peut pas se faire sur soi-m棚me"
+
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Le correspondant n'est plus pr辿sent sur le r辿seau"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "Accord de clef demand辿 par %s. Voulez-vous 辿tablir cet accord�?"
-
-#: src/protocols/silc/buddy.c:297
+msgstr "Accord de cl辿 demand辿 par %s. Voulez-vous 辿tablir cet accord�?"
+
+#: ../src/protocols/silc/buddy.c:298
 #, 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"
+"Le correspondant attend un accord de cl辿 sur�:\n"
 "H担te distant�: %s\n"
 "Port distant�: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
-msgstr "Requ棚te d'accord de clef"
-
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+msgstr "Requ棚te d'accord de cl辿"
+
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Message avec mot de passe"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
-msgstr "Impossible de choisir la clef du message"
-
-#: src/protocols/silc/buddy.c:464
+msgstr "Impossible de choisir la cl辿 du message"
+
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Mot de passe du message"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
-msgstr "R辿cup辿rer la clef publique"
-
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+msgstr "R辿cup辿rer la cl辿 publique"
+
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
-msgstr "Impossible de r辿cup辿rer la clef publique"
-
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+msgstr "Impossible de r辿cup辿rer la cl辿 publique"
+
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
-msgstr "Afficher la clef publique"
-
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+msgstr "Afficher la cl辿 publique"
+
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236
 msgid "Could not load public key"
-msgstr "Impossible de charger la clef publique"
-
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+msgstr "Impossible de charger la cl辿 publique"
+
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Informations"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Impossible de r辿cup辿rer les informations"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s n'est pas un contact de confiance"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "Impossible de recevoir des notifications d'un contact avant d'importer sa "
-"clef publique. Utilisez 束�R辿cup辿rer clef publique�損 pour l'importer."
+"cl辿 publique. Utilisez 束�R辿cup辿rer cl辿 publique�損 pour l'importer."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073
 #, 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:1040
+#: ../src/protocols/silc/buddy.c:1076
 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:1043
-msgid "Import..."
-msgstr "Importer..."
-
-#: src/protocols/silc/buddy.c:1130
+"Vous devez importer la cl辿 publique d'un contact pour pouvoir l'ajouter � la "
+"liste de contacts. Choisissez 束�Importer�損 pour ce faire."
+
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "_Importer..."
+
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Choisissez un des utilisateurs"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177
 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 "
+"Plusieurs utilisateurs ont la m棚me cl辿 publique. Choisissez l'utilisateur "
 "que vous voulez ajouter � la liste de contacts."
 
-#: src/protocols/silc/buddy.c:1134
+#: ../src/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9254,213 +10492,213 @@
 "Plusieurs utilisateurs ont le m棚me nom. Choisissez l'utilisateur que vous "
 "voulez ajouter � la liste de contacts."
 
-#: src/protocols/silc/buddy.c:1415
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "D辿tach辿"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indispos辿"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "R辿veillez-moi"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hyperactif"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Heureux"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "En col竪re"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Honteux"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Amoureux"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Somnolant"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Ennuy辿"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Excit辿"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Anxieux"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Mode utilisateur"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Humeur"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Texte de status"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "M辿thodes de contact pr辿f辿r辿es"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Langue pr辿f辿r辿e"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Appareil"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Localisation"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
-msgstr "Remise � z辿ro de la clef de message"
-
-#: src/protocols/silc/buddy.c:1572
+msgstr "Remise � z辿ro de la cl辿 de message"
+
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
-msgstr "Message avec 辿change de clef"
-
-#: src/protocols/silc/buddy.c:1576
+msgstr "Message avec 辿change de cl辿"
+
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Message avec mot de passe"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
-msgstr "R辿cup辿rer la clef publique..."
-
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+msgstr "R辿cup辿rer la cl辿 publique..."
+
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Tuer l'utilisateur"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "Dessiner sur le tableau"
+
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
-msgstr "_Phrase clef�:"
-
-#: src/protocols/silc/chat.c:79
+msgstr "_Phrase cl辿�:"
+
+#: ../src/protocols/silc/chat.c:80
 #, 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:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Informations du salon"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Impossible de r辿cup辿rer les informations du salon"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nom du salon�:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Nombre d'utilisateurs�:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fondateur du salon�:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Phrase clef du salon�:</b> %s"
-
-#: src/protocols/silc/chat.c:140
+msgstr "<br><b>Phrase cl辿 du salon�:</b> %s"
+
+#: ../src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>Clef HMAC du salon�:</b> %s"
-
-#: src/protocols/silc/chat.c:145
+msgstr "<br><b>Cl辿 HMAC du salon�:</b> %s"
+
+#: ../src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Sujet�:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Mode du salon�:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>Empreinte de clef publique du fondateur�:</b><br>%s"
-
-#: src/protocols/silc/chat.c:164
+msgstr "<br><b>Empreinte de cl辿 publique du fondateur�:</b><br>%s"
+
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Babillage de clef publique du fondateur�:</b><br>%s"
-
-#: src/protocols/silc/chat.c:234
+msgstr "<br><b>Babillage de cl辿 publique du fondateur�:</b><br>%s"
+
+#: ../src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
-msgstr "Ajouter une clef publique au salon"
+msgstr "Ajouter une cl辿 publique au salon"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
-msgstr "Ouvrir clef publique..."
-
-#: src/protocols/silc/chat.c:398
+msgstr "Ouvrir cl辿 publique..."
+
+#: ../src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
-msgstr "Phrase clef du salon"
-
-#: src/protocols/silc/chat.c:405
+msgstr "Phrase cl辿 du salon"
+
+#: ../src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
-msgstr "Clefs publiques du salon"
-
-#: src/protocols/silc/chat.c:410
+msgstr "Cl辿s publiques du salon"
+
+#: ../src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9469,324 +10707,332 @@
 "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:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+"non autoris辿s. L'authentification peut 棚tre par une phrase cl辿 ou par des "
+"signatures num辿riques. Quand la phrase cl辿 est utilis辿e, elle est n辿cessaire "
+"pour joindre le salon. Si des cl辿s publiques sont utilis辿es, seuls les "
+"utilisateurs de ces cl辿s peuvent joindre le salon."
+
+#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
+#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "Authentification du salon"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Ajouter/Supprimer"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:944
 msgid "Passphrase"
-msgstr "Phrase clef"
-
-#: src/protocols/silc/chat.c:591
+msgstr "Phrase cl辿"
+
+#: ../src/protocols/silc/chat.c:592
 #, 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:593
+msgstr "Saisissez le groupe priv辿 et la phrase cl辿 du salon %s"
+
+#: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Ajouter un groupe priv辿 au salon"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Limite d'utilisateurs"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nombre d'utilisateurs maximum du salon. Z辿ro pour ne pas mettre de limite."
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Infos"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Liste d'invitations"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Liste des bannissements"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Nouveau groupe priv辿"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Enlever le mode permanent"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Mettre le mode permanent"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Choisir la limite d'utilisateurs"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Enlever le mode sujet restreint"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Mettre le mode sujet restreint"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
-msgstr "Enlevet le mode priv辿"
-
-#: src/protocols/silc/chat.c:933
+msgstr "Enlever le mode priv辿"
+
+#: ../src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Mettre le mode priv辿"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Enlever le mode secret"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Mettre le mode secret"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1033
 #, 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:1012
+#: ../src/protocols/silc/chat.c:1037
 #, 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:1071
+#: ../src/protocols/silc/chat.c:1096
 #, 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:1073
+#: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
 msgstr "Joindre un groupe priv辿"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1099
 msgid "Cannot join private group"
 msgstr "Impossible de joindre le groupe priv辿"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+msgid "Call Command"
+msgstr "Commande d'appel"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "Impossible de lancer la commande"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
 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:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "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
+#: ../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
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permission refus辿e"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "�chec de l'accord de clef"
-
-#: src/protocols/silc/ft.c:102
-#, fuzzy
+msgstr "�chec de l'accord de cl辿"
+
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "Session de transfert de fichier inexistante"
-
-#: src/protocols/silc/ft.c:206
+msgstr "Session de transfert de fichier inexistante."
+
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Aucune session de transfert de fichier active"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Transfert de fichier d辿j� commenc辿"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 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:222
+msgstr "Impossible de faire l'accord de cl辿 pour le transfert de fichier"
+
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Impossible de commencer le transfert de fichier"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Impossible d'envoyer le fichier"
 
 # c-format
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a chang辿 le sujet de <I>%s</I> en�: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en�: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a supprim辿 tous les modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en�: %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a supprim辿 tous les modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Vous avez 辿t辿 expuls辿 de <I>%s</I> par <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Vous avez 辿t辿 tu辿 par %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Tu辿 par %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "D辿connexion du serveur"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Date de naissance"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Position"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "R担le"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Groupe"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "Courriel"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Commentaire"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Joindre une discussion"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "Texte d'辿tat"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
-msgstr "Empreinte de clef publique"
-
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+msgstr "Empreinte de cl辿 publique"
+
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
-msgstr "Babillage de clef publique"
-
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "Plus..."
-
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+msgstr "Babillage de cl辿 publique"
+
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "_Plus..."
+
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "Se d辿tacher du serveur"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Impossible de se d辿tacher"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Impossible de changer le sujet"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Impossible de changer de pseudo"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Liste des salons"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Impossible de r辿cup辿rer la liste des salons"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
-msgstr "Aucune clef publique re巽ue"
-
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+msgstr "Aucune cl辿 publique re巽ue"
+
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Informations du serveur"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Impossible de r辿cup辿rer les informations du serveur"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Statistiques du serveur"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Impossible de r辿cup辿rer les statistiques du serveur"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Aucune statistique du serveur disponible"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9821,121 +11067,121 @@
 "Nombre total d'op辿rateurs de serveurs: %d\n"
 "Nombre total d'op辿rateurs de routeurs: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Statistiques du r辿seau"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "�chec du ping"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "R辿ponse du ping par le serveur"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Impossible de tuer l'utilisateur"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Erreur � la connexion au serveur SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
-msgstr "�chec de l'辿change de clef"
-
-#: src/protocols/silc/ops.c:1508
+msgstr "�chec de l'辿change de cl辿"
+
+#: ../src/protocols/silc/ops.c:1722
 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:1543
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "D辿connexion par le serveur"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Reprise de la session"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Authentification de la connexion"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
-msgstr "V辿rification de la clef publique du serveur"
-
-#: src/protocols/silc/ops.c:1695
+msgstr "V辿rification de la cl辿 publique du serveur"
+
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
-msgstr "Phrase clef n辿cessaire"
-
-#: src/protocols/silc/ops.c:1724
+msgstr "Phrase cl辿 n辿cessaire"
+
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "�chec�: version incompatible, veuillez mettre � jour votre client"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941
 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:1730
+"cl辿 publique"
+
+#: ../src/protocols/silc/ops.c:1944
 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:1733
+#: ../src/protocols/silc/ops.c:1947
 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:1736
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "�chec�: le correspondant ne supporte pas le PKCS propos辿"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953
 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:1742
+"�chec�: le correspondant ne supporte pas la fonction de hachage propos辿e"
+
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "�chec�: le correspondant ne supporte pas le HMAC propos辿"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "�chec�: signature incorrecte"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "�chec�: cookie invalide"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "�chec de l'authentification"
 
-#: src/protocols/silc/pk.c:103
+#: ../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
+"La cl辿 re巽ue de %s ne correspond pas � votre copie locale de cette cl辿 "
+"publique. Voulez-vous n辿anmoins accepter cette cl辿 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
+msgstr "Voulez-vous acceptez la cl辿 publique re巽ue de %s�?"
+
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9943,53 +11189,66 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"L'empreinte et le babillage pour la clef de %s sont�:\n"
+"L'empreinte et le babillage pour la cl辿 de %s sont�:\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
-msgstr "V辿rifier la clef publique"
-
-#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "Voir..."
-
-#: src/protocols/silc/pk.c:141
+msgstr "V辿rifier la cl辿 publique"
+
+#: ../src/protocols/silc/pk.c:119
+msgid "_View..."
+msgstr "_Voir..."
+
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
-msgstr "Type de clef publique non support辿"
-
-#: src/protocols/silc/silc.c:154
+msgstr "Type de cl辿 publique non support辿"
+
+#: ../src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "�chec de la connexion"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "Impossible d'initialiser la connexion client SILC"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
-msgstr "�change de clef en cours"
-
-#: src/protocols/silc/silc.c:270
+msgstr "�change de cl辿 en cours"
+
+#: ../src/protocols/silc/silc.c:283
 msgid "Out of memory"
 msgstr "Pas assez de m辿moire"
 
+#: ../src/protocols/silc/silc.c:324
+msgid "Cannot initialize SILC protocol"
+msgstr "Impossible d'initialiser le protocole SILC."
+
+#: ../src/protocols/silc/silc.c:331
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Impossible de trouver ou d'acc辿der au dossier ~/.silc"
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "Connexion au serveur SILC"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:345
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Impossible de charger la paire de cl辿s SILC�: %s"
+
+#: ../src/protocols/silc/silc.c:365
+msgid "Unable to create connection"
+msgstr "Impossible de cr辿er une connexion."
+
+#: ../src/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Votre humeur actuelle"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "Normal"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9997,43 +11256,43 @@
 "\n"
 "Vos m辿thodes de contact pr辿f辿r辿es"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Visioconf辿rence"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Votre 辿tat actuel"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Services en ligne"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Publier les services utilis辿s"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Publier l'ordinateur utilis辿"
 
-#: src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Votre carte de visite VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
-msgstr "Attributs d'辿tat"
-
-#: src/protocols/silc/silc.c:712
+msgstr "Attributs d'辿tat utilisateur"
+
+#: ../src/protocols/silc/silc.c:745
 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 "
@@ -10043,131 +11302,172 @@
 "vos informations personnelles. Veuillez saisir les informations que vous "
 "voulez publier."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
+#: ../src/protocols/silc/silc.c:1431
 msgid "Message of the Day"
 msgstr "Message du jour"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "Message du jour non disponible"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
 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:800
+#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+msgid "Create New SILC Key Pair"
+msgstr "Cr辿er une nouvelle paire de cl辿s SILC"
+
+#: ../src/protocols/silc/silc.c:837
+msgid "Passphrases do not match"
+msgstr "Les phrases de passe diff竪rent"
+
+#: ../src/protocols/silc/silc.c:881
+msgid "Key Pair Generation failed"
+msgstr "�chec de g辿n辿ration de la paire de cl辿s"
+
+#: ../src/protocols/silc/silc.c:920
+msgid "Key Length"
+msgstr "Longueur de cl辿"
+
+#: ../src/protocols/silc/silc.c:922
+msgid "Public Key File"
+msgstr "Fichier de cl辿 publique"
+
+#: ../src/protocols/silc/silc.c:924
+msgid "Private Key File"
+msgstr "Fichier de cl辿 priv辿e"
+
+#: ../src/protocols/silc/silc.c:933
+msgid "Real Name"
+msgstr "Nom r辿el"
+
+#: ../src/protocols/silc/silc.c:947
+msgid "Re-type Passphrase"
+msgstr "Ressaisissez la phrase de passe"
+
+#: ../src/protocols/silc/silc.c:954
+msgid "Generate Key Pair"
+msgstr "G辿n辿rer une paire de cl辿s"
+
+#: ../src/protocols/silc/silc.c:998
 msgid "Online Status"
-msgstr "Status"
-
-#: src/protocols/silc/silc.c:809
+msgstr "�tat en ligne"
+
+#: ../src/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "Voir le message du jour"
 
-#: src/protocols/silc/silc.c:882
+#: ../src/protocols/silc/silc.c:1011
+msgid "Create SILC Key Pair..."
+msgstr "Cr辿er une paire de cl辿s SILC..."
+
+#: ../src/protocols/silc/silc.c:1110
 #, 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:1033
+#: ../src/protocols/silc/silc.c:1302
 msgid "Topic too long"
 msgstr "Sujet trop long"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1383
 msgid "You must specify a nick"
 msgstr "Vous devez choisir un pseudo"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel %s not found"
 msgstr "Salon %s non trouv辿e"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1490
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Le mode du salon %s est�: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1492
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "Le salon %s n'a pas de mode sp辿cifiqie"
-
-#: src/protocols/silc/silc.c:1236
+msgstr "Le salon %s n'a pas de mode sp辿cifique."
+
+#: ../src/protocols/silc/silc.c:1505
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Impossible de changer le cmode de %s"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1535
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Commande inconnue�: %s (cela peut 棚tre un bug de Gaim)"
 
-#: src/protocols/silc/silc.c:1329
+#: ../src/protocols/silc/silc.c:1598
 msgid "part [channel]:  Leave the chat"
 msgstr "part [salon]�: Quitter le salon."
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1602
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [salon]�: Quitter le salon."
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1606
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [nouveau sujet]�: Voir ou changer le sujet du salon."
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1611
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;salon&gt; [mot de passe]�: Joindre une discussion sur ce r辿seau."
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1615
 msgid "list:  List channels on this network"
 msgstr "list�: R辿cup辿rer la liste des salons du r辿seau."
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1619
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudo&gt;�: R辿cup辿rer des informations sur une personne."
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt;�: Envoyer un message priv辿 � une personne."
 
-#: src/protocols/silc/silc.c:1358
+#: ../src/protocols/silc/silc.c:1627
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt;�: Envoyer un message priv辿 � une personne."
 
-#: src/protocols/silc/silc.c:1362
+#: ../src/protocols/silc/silc.c:1631
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd�: Voir le message du jour du serveur."
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1635
 msgid "detach:  Detach this session"
 msgstr "detach�: D辿tacher la session en cours."
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1639
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [message]�: Se d辿connecter du serveur avec un message de d辿part "
 "facultatif."
 
-#: src/protocols/silc/silc.c:1374
+#: ../src/protocols/silc/silc.c:1643
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;commande&gt;�: Appeler une commande du client silc."
 
-#: src/protocols/silc/silc.c:1380
+#: ../src/protocols/silc/silc.c:1649
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;pseudo&gt; [-clefpub|&lt;raison&gt;]�: Tuer le pseudo."
-
-#: src/protocols/silc/silc.c:1384
+msgstr "kill &lt;pseudo&gt; [-cl辿pub|&lt;raison&gt;]�: Tuer le pseudo."
+
+#: ../src/protocols/silc/silc.c:1653
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nouveau pseudo&gt;�: Changer de pseudonyme."
 
-#: src/protocols/silc/silc.c:1388
+#: ../src/protocols/silc/silc.c:1657
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;pseudo&gt;�: R辿cup辿rer des informations sur une personne."
 
-#: src/protocols/silc/silc.c:1392
+#: ../src/protocols/silc/silc.c:1661
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10175,7 +11475,7 @@
 "cmode &lt;salon&gt; [+|-&lt;modes&gt;] [arguments]�: Changer ou afficher le "
 "mode d'un salon."
 
-#: src/protocols/silc/silc.c:1396
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10183,17 +11483,17 @@
 "cumode &lt;salon&gt; +|-&lt;modes&gt; &lt;pseudo&gt;�: Changer le mode d'une "
 "personne sur un salon."
 
-#: src/protocols/silc/silc.c:1400
+#: ../src/protocols/silc/silc.c:1669
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes utilisateur&gt;�: Changer vos param竪tres utilisateur."
 
-#: src/protocols/silc/silc.c:1404
+#: ../src/protocols/silc/silc.c:1673
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;pseudo&gt; [-clefpub]�: Obtenir le status d'op辿rateur sur le "
+"oper &lt;pseudo&gt; [-cl辿pub]�: Obtenir le pouvoir d'op辿rateur sur le "
 "serveur."
 
-#: src/protocols/silc/silc.c:1408
+#: ../src/protocols/silc/silc.c:1677
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10201,38 +11501,38 @@
 "invite &lt;salon&gt; [-|+]&lt;pseudo&gt;�: Inviter une personne, l'ajouter "
 "ou la supprimer de la liste d'invitations du salon."
 
-#: src/protocols/silc/silc.c:1412
+#: ../src/protocols/silc/silc.c:1681
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;salon&gt; &lt;pseudo&gt; [raison]�: Expulser une personne du salon."
 
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:1685
 msgid "info [server]:  View server administrative details"
 msgstr "info [serveur]�: Voir les informations sur le serveur."
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1689
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;salon&gt; +|-&lt;pseudo&gt;]�: Bannir une personne du salon."
 
-#: src/protocols/silc/silc.c:1424
+#: ../src/protocols/silc/silc.c:1693
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;pseudo|serveur&gt;�: R辿cup辿rer la clef publique d'une personne ou "
+"getkey &lt;pseudo|serveur&gt;�: R辿cup辿rer la cl辿 publique d'une personne ou "
 "du serveur."
 
-#: src/protocols/silc/silc.c:1428
+#: ../src/protocols/silc/silc.c:1697
 msgid "stats:  View server and network statistics"
 msgstr "stats�: Voir les statistiques du serveur et du r辿seau."
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1701
 msgid "ping:  Send PING to the connected server"
 msgstr "ping�: Envoyer un PING au serveur."
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1706
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;salon&gt;�: R辿cup辿rer la liste des personnes dans un salon."
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1710
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10240,30 +11540,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;salon(s)&gt;�: R辿cup辿rer la "
 "liste de certaines personnes dans des salons."
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Messages instantan辿s"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Signer num辿riquement tous les messages"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "V辿rifier la signature de tous les messages"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Discussions"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Signer num辿riquement tous les messages des salons"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "V辿rifier la signature de tous les messages des salons"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10273,246 +11549,351 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocole de conf辿rences instantan辿es s辿curis辿es"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1859
 msgid "Public Key file"
-msgstr "Fichier de clef publique"
-
-#: src/protocols/silc/silc.c:1604
+msgstr "Fichier de cl辿 publique"
+
+#: ../src/protocols/silc/silc.c:1863
 msgid "Private Key file"
-msgstr "Fichier de clef priv辿e"
-
-#: src/protocols/silc/silc.c:1607
+msgstr "Fichier de cl辿 priv辿e"
+
+#: ../src/protocols/silc/silc.c:1873
+msgid "Cipher"
+msgstr "Chiffre"
+
+#: ../src/protocols/silc/silc.c:1883
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../src/protocols/silc/silc.c:1886
 msgid "Public key authentication"
-msgstr "Authentification par clef publique"
-
-#: src/protocols/silc/silc.c:1611
+msgstr "Authentification par cl辿 publique"
+
+#: ../src/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
 msgstr "Emp棚cher l'observation par les autres utilisateurs"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1892
 msgid "Block invites"
 msgstr "Bloquer les invitations"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
-msgstr "Bloquer les messages sans 辿change de clef"
-
-#: src/protocols/silc/silc.c:1620
+msgstr "Bloquer les messages sans 辿change de cl辿"
+
+#: ../src/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
 msgstr "Emp棚cher les requ棚tes d'attributs d'辿tat"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1901
+msgid "Block messages to whiteboard"
+msgstr "Bloquer les messages au tableau"
+
+#: ../src/protocols/silc/silc.c:1904
+msgid "Automatically open whiteboard"
+msgstr "Ouvrir automatiquement le tableau"
+
+#: ../src/protocols/silc/silc.c:1907
+msgid "Digitally sign and verify all messages"
+msgstr "Signer num辿riquement et v辿rifier tous les messages"
+
+#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
-msgstr "Cr辿ation de la paire de clefs SILC..."
+msgstr "Cr辿ation de la paire de cl辿s SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: ../src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom r辿el�: %s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'utilisateur�: %s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Adresse 辿lectronique�: %s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nom d'h担te�: %s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation�: %s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Pays�: %s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithme�: %s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Longueur de clef�: %d bits\n"
-
-#: src/protocols/silc/util.c:327
+msgstr "Longueur de cl辿�: %d bits\n"
+
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
 msgstr ""
-"Empreinte de clef publique�:\n"
+"Empreinte de cl辿 publique�:\n"
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Babillage de clef publique�:\n"
+"Babillage de cl辿 publique�:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
 msgid "Public Key Information"
-msgstr "Informations sur la clef publique"
-
-#: src/protocols/silc/util.c:515
+msgstr "Informations sur la cl辿 publique"
+
+#: ../src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Bipeur"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s a envoy辿 un message sur le tableau. Voulez-vous ouvrir le tableau�?"
+
+#: ../src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s a envoy辿 un message sur le tableau du salon %s. Voulez-vous ouvrir le "
+"tableau�?"
+
+#: ../src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "Tableau"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:415
+msgid "Could not write"
+msgstr "Impossible d'envoyer"
+
+#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+msgid "Could not connect"
+msgstr "Impossible de se connecter"
+
+#: ../src/protocols/simple/simple.c:924
+msgid "Wrong Password"
+msgstr "Mauvais mot de passe"
+
+#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
+#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
+msgid "Could not create listen socket"
+msgstr "Impossible de cr辿er le socket d'辿coute"
+
+#: ../src/protocols/simple/simple.c:1383
+msgid "Couldn't resolve host"
+msgstr "Impossible de trouver l'adresse de l'h担te"
+
+#: ../src/protocols/simple/simple.c:1481
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Les identifiants SIP ne peuvent pas avoir d'espace ou de symbole @."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1643
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin pour le protocole SIP/SIMPLE"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1644
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin pour le protocole SILC"
+
+#: ../src/protocols/simple/simple.c:1666
+msgid "Publish status (note: everyone may watch you)"
+msgstr "�tat de publication (note�: tout le mode peut vous regarder)"
+
+#: ../src/protocols/simple/simple.c:1672
+msgid "Use UDP"
+msgstr "Utiliser UDP"
+
+#: ../src/protocols/simple/simple.c:1674
+msgid "Use proxy"
+msgstr "Utiliser un serveur mandataire"
+
+#: ../src/protocols/simple/simple.c:1676
+msgid "Proxy"
+msgstr "Serveur mandataire"
+
+#: ../src/protocols/simple/simple.c:1678
+msgid "Auth User"
+msgstr "Utilisateur d'authentification"
+
+#: ../src/protocols/simple/simple.c:1680
+msgid "Auth Domain"
+msgstr "Domaine d'authentification"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Recherche de %s"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connexion � %s 辿chou辿e"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Connexion�: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'辿crire dans le fichier %s"
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s"
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, 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:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne"
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les avertissements de %s ne sont pas autoris辿s."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 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:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La discussion %s est inaccessible."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite � %s."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, 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:509
+#: ../src/protocols/toc/toc.c:509
 #, 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:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "�chec"
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Trop de r辿ponses"
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de crit竪res."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "L'annuaire est temporairement indisponible."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "La recherche par adresse 辿lectronique est restreinte."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
-msgstr "Mot clef ignor辿"
-
-#: src/protocols/toc/toc.c:530
+msgstr "Mot cl辿 ignor辿"
+
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
-msgstr "Pas de mot-clef"
-
-#: src/protocols/toc/toc.c:533
+msgstr "Pas de mot-cl辿"
+
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'informations personnelles."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Pays non support辿"
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "�chec inconnu�: %s"
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 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:552
+#: ../src/protocols/toc/toc.c:552
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -10521,44 +11902,43 @@
 "et r辿essayez. Si vous persistez maintenant, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue � la connexion�: %s"
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, 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:584
-#, fuzzy
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
-msgstr "Groupe non valide"
-
-#: src/protocols/toc/toc.c:668
+msgstr "Nom de groupe non valide."
+
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Connexion termin辿e"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "En attente de r辿ponse..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 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:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
-msgstr "Changement de mot de passe effectu辿"
-
-#: src/protocols/toc/toc.c:993
+msgstr "Changement de mot de passe effectu辿."
+
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC a envoy辿 une commande PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10568,45 +11948,53 @@
 "d辿connecter si vous en envoyez un. Gaim emp棚chera ceci. Ce n'est que "
 "temporaire, soyez patient."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Chercher dans l'annuaire"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "�diter les informations"
+
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Changer les informations"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Changer de mot de passe"
+
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossible d'ouvrir %s pour l'辿criture"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
-msgstr "�chec du tranfert de fichier. Annulation probable du correspondant."
-
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+msgstr "�chec du transfert de fichier. Annulation probable du correspondant."
+
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Impossible de se connecter pour le transfert"
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 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:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Enregistrer sous..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, 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:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
@@ -10621,27 +12009,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2320 ../src/protocols/toc/toc.c:2322
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2341
 msgid "TOC host"
 msgstr "H担te TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2345
 msgid "TOC port"
 msgstr "Port TOC"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas 辿t辿 envoy辿"
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
 msgid "Buzz!!"
 msgstr "Dring�!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: ../src/protocols/yahoo/yahoo.c:810
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message syst竪me Yahoo! pour %s�:"
@@ -10649,23 +12037,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: ../src/protocols/yahoo/yahoo.c:906
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "L'utilisateur %s veut ajouter %s � sa liste de contacts�%s%s"
 
-#: src/protocols/yahoo/yahoo.c:893
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Message (optional) :"
 msgstr "Message (facultatif)�:"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: ../src/protocols/yahoo/yahoo.c:954
 #, 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:938
+#: ../src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10674,11 +12062,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:941
+#: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refus辿"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1703
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10689,11 +12077,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:1687
+#: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
 msgstr "�chec de l'authentification Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10702,19 +12090,19 @@
 "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:1763
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact�?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Nom d'utilisateur non valide"
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "�chec de l'authentification standard"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10724,134 +12112,143 @@
 "La m辿thode d'authentification normale a 辿chou辿. Cela signifie que votre mot "
 "de passe est incorrect ou que Yahoo! utilise un nouveau syst竪me "
 "authentification. Gaim va essayer de se connecter en utilisant "
-"l'authentification par le Web, au d辿triment de certaines fonctionalit辿s."
-
-#: src/protocols/yahoo/yahoo.c:1817
+"l'authentification par le Web, au d辿triment de certaines fonctionnalit辿s."
+
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect"
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
-"Votre compte est block辿. Veuillez vous connecter par le site web Yahoo!."
-
-#: src/protocols/yahoo/yahoo.c:1823
+"Votre compte est bloqu辿. Veuillez vous connecter par le site web Yahoo!."
+
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erreur inconnue n属%d. Se connecter sur le site web Yahoo! peut corriger le "
 "probl竪me."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s"
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2011
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
+#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Impossible de lire"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Probl竪me de connexion"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3294
+msgid "Not at Home"
 msgstr "Pas � la maison"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3297
+msgid "Not at Desk"
 msgstr "Pas au bureau"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3300
+msgid "Not in Office"
 msgstr "Pas au travail"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
 msgid "Appear Online"
-msgstr "Invisible"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+msgstr "Appara樽tre connect辿"
+
+#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
 msgid "Appear Permanently Offline"
+msgstr "Appara樽tre toujours d辿connect辿"
+
+#: ../src/protocols/yahoo/yahoo.c:2887
+msgid "Presence"
+msgstr "Pr辿sence"
+
+#: ../src/protocols/yahoo/yahoo.c:2930
+msgid "Appear Offline"
 msgstr "Invisible"
 
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "�tat"
-
-#: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2939
 msgid "Don't Appear Permanently Offline"
-msgstr "Invisible"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr "Ne pas appara樽tre toujours d辿connect辿"
+
+#: ../src/protocols/yahoo/yahoo.c:2987
 msgid "Join in Chat"
 msgstr "Joindre dans une discussion"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2993
 msgid "Initiate Conference"
 msgstr "Lancer une conf辿rence"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:3021
+msgid "Presence Settings"
+msgstr "Param竪tres de pr辿sence"
+
+#: ../src/protocols/yahoo/yahoo.c:3027
 msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2963
+msgstr "Commencer � griffonner"
+
+#: ../src/protocols/yahoo/yahoo.c:3059
 msgid "Active which ID?"
 msgstr "Activer quelle identit辿�?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3068
 msgid "Join who in chat?"
 msgstr "Qui joindre dans une discussion�?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3078
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "Joindre un utilisateur dans une discussion..."
-
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3082
+msgid "Join User in Chat..."
+msgstr "Joindre l'utilisateur dans une discussion..."
+
+#: ../src/protocols/yahoo/yahoo.c:3620
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;�: Joindre une discussion sur le r辿seau Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz�: Faire sonner chez un contact pour attirer son attention"
-
-#: src/protocols/yahoo/yahoo.c:3550
+#: ../src/protocols/yahoo/yahoo.c:3625
+msgid "list: List rooms on the Yahoo network"
+msgstr "list�: R辿cup辿rer la liste des salons du r辿seau Yahoo."
+
+#: ../src/protocols/yahoo/yahoo.c:3629
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz�: Faire sonner chez un contact pour attirer son attention."
+
+#: ../src/protocols/yahoo/yahoo.c:3633
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle�: Envoie une requ棚te pour un s辿ance de griffonnage."
 
 #. *< type
 #. *< ui_requirement
@@ -10863,68 +12260,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3746
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: ../src/protocols/yahoo/yahoo.c:3749
 msgid "Pager host"
 msgstr "H担te du pager"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: ../src/protocols/yahoo/yahoo.c:3752
 msgid "Japan Pager host"
 msgstr "H担te japonais pour le pager"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3755
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3758
 msgid "File transfer host"
 msgstr "H担te de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3761
+msgid "Japan file transfer host"
 msgstr "H担te japonais de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3764
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: ../src/protocols/yahoo/yahoo.c:3767
+msgid "Chat room locale"
 msgstr "Langue du salon de discussion"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: ../src/protocols/yahoo/yahoo.c:3770
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorer les invitations aux conf辿rences et salons de discussion"
+
+#: ../src/protocols/yahoo/yahoo.c:3774
+msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussion"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: ../src/protocols/yahoo/yahoo.c:3777
+msgid "YCHT host"
 msgstr "H担te YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: ../src/protocols/yahoo/yahoo.c:3780
+msgid "YCHT port"
 msgstr "Port YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Adresse IP�:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japon"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10932,7 +12333,7 @@
 "D辿sol辿, les profils marqu辿s pour adultes ne sont pas support辿s pour "
 "l'instant."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10940,53 +12341,55 @@
 "Si vous voulez voir ce profil, vous devez ouvrir ce lien dans votre "
 "navigateur."
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
 msgstr "Passe-temps"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "Derni竪res nouvelles"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "Page web"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "Lien sympa 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "Lien sympa 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "Lien sympa 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
 msgstr "Derni竪re mise � jour"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Les informations sur %s ne sont pas disponibles"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr "D辿sol辿, ce profil est dans une langue non support辿e pour l'instant."
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"D辿sol辿, ce profil a l'air d'棚tre dans une langue ou un format non support辿 "
+"pour l'instant."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10995,7 +12398,7 @@
 "probablement d'un probl竪me temporaire sur le serveur. Veuillez r辿essayez "
 "plus tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11006,66 +12409,87 @@
 "certains profils. Si vous savez que l'utilisateur existe, veuillez r辿essayez "
 "plus tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s a d辿clin辿 votre invitation � la conf辿rence 束�%s�損 pour la raison�: %s"
 
-#: src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invitation refus辿e"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Impossible de joindre la discussion"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Salon de discussion inconnu"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
 msgstr "Le salon de discussion est peut-棚tre plein"
 
-#: src/protocols/yahoo/yahoochat.c:435
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Non disponible"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erreur inconnue. Il vous faudra peut-棚tre vous d辿connecter et attendre cinq "
+"minutes avant de pouvoir retourner dans un salon de discussion."
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Vous discutez dans %s"
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "Impossible de joindre le contact dans la discussion"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "Le contact n'est peut-棚tre pas dans une discussion"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "�chec de r辿cup辿ration de la liste des salons de discussion"
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "Voix"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "Impossible de r辿cup辿rer la liste des salons"
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "Salon de discussion utilisateur"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Probl竪me de connexion avec le serveur YCHT"
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -11073,83 +12497,82 @@
 "(Erreur de conversion du message. V辿rifiez l'option 束�Codage�損 dans les "
 "options du compte)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#: ../src/protocols/zephyr/zephyr.c:686
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossible d'辿crire dans le salon %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilisateur�:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisible ou d辿connect辿"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>� %s depuis %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Tout le monde"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2278
 msgid "_Class:"
 msgstr "_Classe�:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2284
 msgid "_Instance:"
 msgstr "_Instance�:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2290
 msgid "_Recipient:"
 msgstr "_Destinataire�:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2301
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "�chec de l'inscription � %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2607
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;pseudo&gt;�: Localiser d'une personne."
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2612
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;pseudo&gt;�: Localiser d'une personne."
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2617
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instance&gt;�: Choisir l'instance � utiliser pour cette classe."
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2622
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instance&gt;�: Choisir l'instance � utiliser pour cette classe."
 
-#: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;instance&gt;�: Choisir l'instance � utiliser pour cette classe."
-
-#: src/protocols/zephyr/zephyr.c:2628
+"topic &lt;instance&gt;�: Choisir l'instance � utiliser pour cette classe."
+
+#: ../src/protocols/zephyr/zephyr.c:2633
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classs&gt; &lt;instance&gt; &lt;destinataire&gt;�: Joindre une "
 "nouvelle discussion."
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2638
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;�: Envoyer un message � &lt;message,<i>instance</i>,*&gt;."
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11157,7 +12580,7 @@
 "zci &lt;classe&gt; &lt;instance&gt;�: Envoyer un message � &lt;<i>classe</i>,"
 "<i>instance</i>,*&gt;."
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2650
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11165,7 +12588,7 @@
 "zcir &lt;classe&gt; &lt;instance&gt; &lt;destinataire&gt;�: Envoyer un "
 "message � &lt;<i>classe</i>,<i>instance</i>,<i>destinataire</i>&gt;."
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2656
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11173,16 +12596,16 @@
 "zir &lt;instance&gt; &lt;destinataire&gt;�: Envoyer un message � &lt;message,"
 "<i>instance</i>,<i>destinataire</i>&gt;."
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2661
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;�: Envoyer un message � &lt;<i>classe</i>,personal,*&gt;."
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2767
 msgid "Resubscribe"
 msgstr "R辿inscription"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2770
 msgid "Retrieve subscriptions from server"
 msgstr "R辿cup辿rer les abonnements du serveur"
 
@@ -11196,610 +12619,250 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2856 ../src/protocols/zephyr/zephyr.c:2858
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin pour le protocole Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2883
 msgid "Export to .anyone"
 msgstr "Exporter vers .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2886
 msgid "Export to .zephyr.subs"
 msgstr "Exporter vers .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2889
 msgid "Import from .anyone"
-msgstr "Exporter vers .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "Importer depuis .anyone"
+
+#: ../src/protocols/zephyr/zephyr.c:2892
 msgid "Import from .zephyr.subs"
-msgstr "Exporter vers .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
+msgstr "Importer depuis .zephyr.subs"
+
+#: ../src/protocols/zephyr/zephyr.c:2895
 msgid "Realm"
-msgstr "Nom r辿el"
-
-#: src/protocols/zephyr/zephyr.c:2889
+msgstr "Domaine"
+
+#: ../src/protocols/zephyr/zephyr.c:2898
 msgid "Exposure"
 msgstr "Exposition"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1212 ../src/proxy.c:1265 ../src/proxy.c:1311
+#: ../src/proxy.c:1332
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Erreur de connexion mandataire %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1324
 #, 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 "
 "%d"
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Erreur de connexion mandataire %d"
-
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318
 msgid "Invalid proxy settings"
 msgstr "Param竪tres du serveur mandataire incorrects"
 
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Le nom d'h担te ou le port pour le serveur mandataire est incorrect."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Accepter"
-
-#: src/server.c:243
+#: ../src/savedstatuses.c:514
+msgid "saved statuses"
+msgstr "saved statuses"
+
+#: ../src/savedstatuses.c:767
+msgid "I'm not here right now"
+msgstr "Je ne suis pas l� pour l'instant."
+
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s est d辿sormais connu sous le nom de %s\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d message)"
-msgstr[1] "(%d messages)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 message)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: ../src/server.c:675
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s a invit辿 %s dans le salon de discussions %s\n"
-
-#: src/server.c:864
+msgstr ""
+"%s a invit辿 %s dans le salon de discussions %s�:\n"
+"%s"
+
+#: ../src/server.c:680
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invit辿 %s dans le salon de discussions %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:684
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation � la discussion�?"
 
-#: src/status.c:153
-#, fuzzy
+#: ../src/status.c:153
 msgid "Unset"
-msgstr "Groupe"
-
-#: src/status.c:156
+msgstr "Enlever"
+
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "Non disponible"
 
-#: src/status.c:621
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "T辿l辿phone portable"
+
+#: ../src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s vient de se connecter."
+
+#: ../src/status.c:627
 #, c-format
 msgid "%s came back"
-msgstr "%s est de retour"
-
-#: src/status.c:626
+msgstr "%s est de retour."
+
+#: ../src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s vient de partir."
+
+#: ../src/status.c:638
 #, c-format
 msgid "%s went away"
-msgstr "%s vient de passer absent"
-
-#: src/status.c:1308
+msgstr "%s vient de passer absent."
+
+#: ../src/status.c:1284
 #, c-format
 msgid "%s became idle"
-msgstr "%s est devenu inactif"
-
-#: src/status.c:1323
+msgstr "%s est devenu inactif."
+
+#: ../src/status.c:1297
 #, c-format
 msgid "%s became unidle"
-msgstr "%s n'est plus inactif"
-
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Absence automatique"
-
-#: src/util.c:2121
-#, fuzzy, c-format
+msgstr "%s n'est plus inactif."
+
+#: ../src/status.c:1359
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s devient inactif."
+
+#: ../src/status.c:1361
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s devient actif."
+
+#: ../src/util.c:649
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2439
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"Erreur � la lecture de 束�%s�損�:\n"
-"%s\n"
-
-#: src/util.c:2122
-#, fuzzy, c-format
+msgstr "Erreur � la lecture de 束�%s�損."
+
+#: ../src/util.c:2440
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Une erreur est survenue � la lecture de la liste de contacts. La liste n'a "
-"pas 辿t辿 charg辿e et l'ancien fichier a 辿t辿 renomm辿 blist.xml~."
-
-#: src/util.c:2567
+"Une erreur est survenue � la lecture de 束�%s�損. Ils n'ont pas 辿t辿 chang辿s, "
+"et l'ancien fichier a 辿t辿 renomm辿 束�%s~�損."
+
+#: ../src/util.c:2933
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: src/util.c:2570
+#: ../src/util.c:2936
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "seconde"
-msgstr[1] "secondes"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "jour"
-msgstr[1] "jours"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "heure"
-msgstr[1] "heures"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minutes"
-
-#: src/util.c:3053
+#: ../src/util.c:2962
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d seconde"
+msgstr[1] "%d secondes"
+
+#: ../src/util.c:2974
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d jour"
+msgstr[1] "%d jours"
+
+#: ../src/util.c:2982
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d heure"
+msgstr[1] "%s, %d heures"
+
+#: ../src/util.c:2988
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d heure"
+msgstr[1] "%d heures"
+
+#: ../src/util.c:2996
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minute"
+msgstr[1] "%s, %d minutes"
+
+#: ../src/util.c:3002
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: ../src/util.c:3477
 msgid "g003: Error opening connection.\n"
 msgstr "g003�: Erreur � l'ouverture de la connexion\n"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Tri de la liste de contacts"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Tri�:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Affichage des contacts"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "Afficher les d辿tails du contact"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Navigateur de Gnome"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "Me_ssages d'absence�:"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "Message d'au revoir"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Restaurer l'辿tat d'absence � la reconnexion"
-
-#~ msgid "Mail Server"
-#~ msgstr "Serveur de courrier"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nouveaux/%d messages)"
-
-#~ msgid "Check Mail"
-#~ msgstr "V辿rifier le courrier"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "V辿rifie le courrier toutes les X secondes.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Connexion auto"
-
-#~ msgid "New..."
-#~ msgstr "Nouveau..."
-
-#~ msgid "Back"
-#~ msgstr "De retour"
-
-#~ msgid "Signoff"
-#~ msgstr "D辿connexion"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Configuration de l'ic担ne de notification"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "Cac_her les nouveaux messages jusqu'au clic de l'ic担ne"
-
-#~ msgid "Orientation"
-#~ msgstr "Disposition"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Orientation de l'espace de notification"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Non connect辿 � AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "Pas de pseudo"
-
-#~ msgid "No roomname given."
-#~ msgstr "Pas de salon"
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Adresse URL AIM non valide"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible d'assigner %s au socket�:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Impossible d'ouvrir le socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "Contr担le � distance"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Permet le contr担le � distance des applications gaim."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Donne la possibilit辿 de contr担ler Gaim gr但ce � gaim-remote ou � d'autres "
-#~ "applications externes."
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "Test des signaux GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr ""
-#~ "V辿rifie que tous les signaux de l'interface graphique fonctionnent "
-#~ "correctement."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Quand une nouvelle conversation est ouverte, le plugin rajoute la "
-#~ "derni竪re conversation avec l'interlocuteur dans la fen棚tre."
-
-#~ msgid "_Apply"
-#~ msgstr "_Appliquer"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Liste de contacts accroch辿e _toujours visible"
-
-#~ msgid "Away!"
-#~ msgstr "Absent�!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "�diter ce message"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Je suis de retour�!"
-
-#~ 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�損�?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Enlever le message d'absence"
-
-#~ msgid "Set All Away"
-#~ msgstr "Absent partout"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Vous ne pouvez cr辿er un message d'absence vide"
-
-#~ msgid "New away message"
-#~ msgstr "Nouveau message d'absence"
-
-#~ msgid "Away title: "
-#~ msgstr "Titre�: "
-
-#~ msgid "_Save"
-#~ msgstr "_Enregistrer"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Enregistrer _et utiliser"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Erreur de liste de contacts"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Taille de la fl竪che de l'辿tendeur"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Usage: %s commande [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDES:\n"
-#~ "       uri                      G竪rer les URI pour le protocole AIM:\n"
-#~ "       away                     Se mettre absent avec le message par "
-#~ "d辿faut\n"
-#~ "       back                     Enlever le status d'absent       "
-#~ "quit                     Fermer l'instance en cours de Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [commande]    Afficher l'aide sp辿cifique � une "
-#~ "commande\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim ne tourne pas (en session 0)\n"
-#~ "V辿rifiez que le plugin 束�Contr担le � distance�損 est bien charg辿.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Utiliser les adresses 'AIM:'�:\n"
-#~ "Envoyer un message � un utilisateur�:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Pingouin&message=salut+tout+le"
-#~ "+monde'\n"
-#~ "Dans cet exemple, 'Pingouin' est le pseudo � qui le message\n"
-#~ "'salut tout le monde' est envoy辿. Des '+' doivent 棚tre utilis辿s � la "
-#~ "place\n"
-#~ "des espaces dans le message.\n"
-#~ "Il faut prendre en compte l'辿chappement des caract竪res si l'appel est "
-#~ "fait\n"
-#~ "depuis un shell o湛 le caract竪re '&' doit 棚tre prot辿g辿.\n"
-#~ "La commande suivante ouvre uniquement une fen棚tre de conversation sans\n"
-#~ "envoyer de message�:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Pingouin'\n"
-#~ "\n"
-#~ "Joindre une discussion�:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=SalonDesPingouins'\n"
-#~ "... permet de joindre le salon de discussion 'SalonDesPingouins'.\n"
-#~ "\n"
-#~ "Ajouter un utilisateur � la liste des contacts�:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Pingouin'\n"
-#~ "... demande l'ajout de 'Pingouin' � la liste de contacts.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ferme le Gaim en cours\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Met le status absent sur tous les comptes avec le message par d辿faut.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Enl竪ve le status absent sur tous les comptes.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Afficher moins d'options"
-
-#~ msgid "Information"
-#~ msgstr "Informations"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Contacts/D辿conne_xion"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Outils/_Absence"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Outils/Action des pl_ugins"
-
-#~ msgid "Rename Group"
-#~ msgstr "Renommer un groupe"
-
-#~ msgid "New group name"
-#~ msgstr "Nouveau nom du groupe"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Saisissez le nouveau nom pour le groupe s辿lectionn辿"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Compte�:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Avertissement�:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Avertissements (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Outils/Absence"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Envoyer un message instantan辿 au contact s辿lectionn辿"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Obtenir les informations sur le contact s辿lectionn辿"
-
-#~ msgid "_Chat"
-#~ msgstr "_Discussion"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Joindre un groupe de discussions"
-
-#~ msgid "_Away"
-#~ msgstr "_Absent"
-
-#~ msgid "Set an away message"
-#~ msgstr "Choisir un message d'absence"
-
-#~ msgid "Done."
-#~ msgstr "Termin辿"
-
-#~ msgid "Signon: "
-#~ msgstr "Inscription�: "
-
-#~ msgid "Signon"
-#~ msgstr "Connexion"
-
-#~ msgid "Cancel All"
-#~ msgstr "Annuler tous"
-
-#~ msgid "_Reconnect"
-#~ msgstr "Se _reconnecter"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s a 辿t辿 d辿connect辿</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Raison inconnue"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "_Tout reconnecter"
-
-#~ msgid "Time"
-#~ msgstr "Heure"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Obtenir le message d'absence"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversation/Donner un avertissement..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversation/Donner un avertissement..."
-
-#~ msgid "Warn"
-#~ msgstr "R辿primander"
-
-#~ msgid "Warn the user"
-#~ msgstr "Donner un avertissement � l'interlocuteur"
-
-#~ msgid "Block the user"
-#~ msgstr "Bloquer les messages de l'interlocuteur"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Envoyer un fichier � l'interlocuteur"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Ajouter l'interlocuteur � la liste de contacts"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Supprimer l'interlocuteur de la liste de contacts"
-
-#~ msgid "Send"
-#~ msgstr "Envoyer"
-
-#~ msgid "Invite"
-#~ msgstr "Inviter"
-
-#~ msgid "Invite a user"
-#~ msgstr "Inviter un utilisateur"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Ajouter le salon de discussion � la liste de contacts"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversation/_Fermer"
-
-#~ msgid "former lead developer"
-#~ msgstr "ancien codeur principal"
-
-#~ msgid "former maintainer"
-#~ msgstr "ancien mainteneur"
+#~ msgid "_Warn"
+#~ msgstr "_R辿primander"
+
+#~ msgid "_Accept"
+#~ msgstr "_Accepter"
+
+#~ msgid "Join A Chat..."
+#~ msgstr "Joindre une discussion..."
+
+#~ msgid "Offline "
+#~ msgstr "D辿connect辿 "
+
+#~ msgid "Default"
+#~ msgstr "D辿faut"
+
+#~ msgid "Pounce Action"
+#~ msgstr "Action de l'alerte"
+
+#~ msgid "Idle time _reporting:"
+#~ msgstr "_Temps d'inactivit辿 affich辿�:"
+
+#~ msgid "Account usage"
+#~ msgstr "Utilisation du compte"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Identifiant Jabber"
+
+#~ msgid "Away Message"
+#~ msgstr "Message d'absence"
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "� valeur 辿gale, choisir le dernier trouv辿"
 
 #~ msgid "Azerbaijani"
 #~ msgstr "Az辿ri"
 
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova et Vladimir (Kaladan) Petkov"
-
 #~ msgid "Burmese"
 #~ msgstr "Birman"
 
@@ -11812,9 +12875,6 @@
 #~ msgid "Albanian"
 #~ msgstr "Albanais"
 
-#~ msgid "Turkish"
-#~ msgstr "Turc"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ukrainien"
 
@@ -11823,638 +12883,3 @@
 
 #~ msgid "Chinese"
 #~ msgstr "Chinois"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Pseudonyme"
-
-#~ msgid "Warn User"
-#~ msgstr "Donner un avertissement"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Donner un avertissement � %s�?</"
-#~ "span>\n"
-#~ "\n"
-#~ "Ceci augmentera le niveau d'avertissement de %s. Cet utilisateur sera "
-#~ "plus s辿v竪rement limit辿 pour sa fr辿quence d'envoi de messages.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Donner un _avertissement anonyme�?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Les avertissements anonymes sont moins durs.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Afficher les d辿tails du transfert"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Aff_icher le pseudonyme distant si aucun alias n'a 辿t辿 donn辿"
-
-#~ msgid "Display"
-#~ msgstr "Affichage"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Afficher l'_heure des messages"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignorer les _couleurs"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignorer les _polices"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignorer la _taille des polices"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Style par d辿faut"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "Ajouter le style par _d辿faut aux messages envoy辿s"
-
-#~ msgid "Send Message"
-#~ msgstr "Envoyer un message"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "La touche _Entr辿e envoie les messages"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_trl-Entr辿e envoie les messages"
-
-#~ msgid "Window Closing"
-#~ msgstr "Fermeture des fen棚tres"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "E_chap ferme la fen棚tre"
-
-#~ msgid "Insertions"
-#~ msgstr "Insertions"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Ctrl-{B/I/U/S} change le st_yle"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Ctrl-(nombre) ins竪re un _smiley"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Afficher les _boutons en tant que�:"
-
-#~ msgid "Pictures"
-#~ msgstr "Images"
-
-#~ msgid "Text"
-#~ msgstr "Texte"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Images et texte"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "Fen棚tre en avant-plan sur _r辿ception d'un message"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Afficher le niveau d'a_vertissement"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "�tendre les contacts multiples _automatiquement"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Activer les commandes 束�_barre�損 (/commande)"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Montrer les _alias dans les onglets et titre de fen棚tres"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Fen棚tre de _message en avant-plan sur r辿ception d'un 辿v辿nement"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Fen棚tre de _discussion en avant-plan sur r辿ception d'un 辿v辿nement"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Utiliser des noms multi_colores dans les discussions"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "_Position des onglets�:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "_Emplacement des nouvelles conversations�:"
-
-#~ msgid "Message Logs"
-#~ msgstr "Archives de messages"
-
-#~ msgid "System Logs"
-#~ msgstr "Journaux du syst棚me"
-
-#~ msgid "_Enable system log"
-#~ msgstr "Activer l'archivage du _journal syst棚me"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Archiver � la _connexion et d辿connexion des contacts"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Archiver le d辿but d'_inactivit辿 des contacts"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Archiver les _absences et retours des contacts"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Archiver ses _propres connexions, inactivit辿s et absences"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "_Temps d'inactivit辿 affich辿�:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Utilisation de Gaim"
-
-#~ msgid "X usage"
-#~ msgstr "Utilisation de X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Utilisation de Windows"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Auteur�: </span>\t%s\n"
-#~ "<span weight=\"bold\">Page web�: </span>\t%s\n"
-#~ "<span weight=\"bold\">Fichier�: </span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Auteur�: </span> %s\n"
-#~ "<span weight=\"bold\">URL�: </span> %s\n"
-#~ "<span weight=\"bold\">Fichier�: </span> %s"
-
-#~ msgid "Load"
-#~ msgstr "Charger"
-
-#~ msgid "Summary"
-#~ msgstr "R辿sum辿"
-
-#~ msgid "Details"
-#~ msgstr "D辿tails"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editer"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Message Text"
-#~ msgstr "Texte du message"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Raccourcis"
-
-#~ msgid "Away Messages"
-#~ msgstr "Messages d'absence"
-
-#~ msgid "Plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Texte en clair"
-
-#~ msgid "Please create an account."
-#~ msgstr "Veuillez cr辿er un compte"
-
-#~ msgid "Login"
-#~ msgstr "Connexion"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Compte�:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>Mot de _passe�:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Comptes"
-
-#~ msgid "P_references"
-#~ msgstr "_Pr辿f辿rences"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Connexion"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          affiche la fen棚tre des comptes\n"
-#~ "  -w, --away[=MESG]   absent � la connexion (MESG indique le nom d'un\n"
-#~ "                      message d'absence facultatif � utiliser)\n"
-#~ "  -l, --login[=NAME]  connexion automatique (NAME indique les comptes \n"
-#~ "                      facultatifs, s辿par辿s par des virgules)\n"
-#~ "  -n, --loginwin      ne pas se connecter automatiquement\n"
-#~ "  -u, --user=NAME     utilise le compte NAME\n"
-#~ "  -c, --config=DIR    utilise le dossier DIR pour la configuration\n"
-#~ "  -d, --debug         affiche les messages de debug en sortie standard\n"
-#~ "  -v, --version       affiche le num辿ro de version\n"
-#~ "  -h, --help          affiche ce message d'aide\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Impossible de charger les pr辿f辿rences"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim n'a pas pu charger vos pr辿f辿rences parce qu'elles sont stock辿es dans "
-#~ "un ancien format d辿sormais inutilis辿. Veuillez reconfigurer vos "
-#~ "param竪tres en utilisant la fen棚tre de pr辿f辿rences (menu Outils)."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "D辿faut peu original"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Disponible pour les amis seulement"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Absent pour les amis seulement"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invisible pour les amis seulement"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Impossible de r辿soudre le nom de l'h担te"
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Erreur � la lecture du socket"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Erreur � l'辿criture du socket"
-
-#~ msgid "Authentication failed."
-#~ msgstr "�chec de l'authentification"
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Code d'erreur inconnu"
-
-#~ msgid "Status: %s"
-#~ msgstr "Status�: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "Impossible de se connecter"
-
-#~ msgid "Reading data"
-#~ msgstr "Lecture de donn辿es"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Poign辿e de main"
-
-#~ msgid "Reading server key"
-#~ msgstr "Lecture de la clef du serveur"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "�change de la clef de hashage"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Erreur critique dans la biblioth竪que GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Impossible de pinguer le serveur"
-
-#~ msgid "Send as message"
-#~ msgstr "Envoyer comme message"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "R辿solution du serveur GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "l'UIN Gadu-Gadu sp辿cifi辿 est non valide"
-
-#~ 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"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "Impossible d'obtenir les r辿sultats de la recherche"
-
-#~ msgid "Birth Year"
-#~ msgstr "Ann辿e de naissance"
-
-#~ msgid "Sex"
-#~ msgstr "Sexe"
-
-#~ 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"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "Impossible d'importer la liste de contacts du serveur"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Liste de contacts transf辿r辿e sur le serveur avec succ竪s"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Impossible de transf辿rer la liste de contacts sur le serveur"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Liste de contacts effac辿e du serveur avec succ竪s"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Impossible d'effacer la liste de contacts du serveur"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Impossible de changer le mot de passe"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Erreur de communication avec le serveur Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Impossible de communiquer avec le serveur HTTP Gadu-Gadu. Veuillez "
-#~ "r辿essayer plus tard."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Impossible d'importer la liste de contacts Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu 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."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Impossible d'exporter la liste de contacts"
-
-#~ 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."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Impossible d'effacer la liste de contacts"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Impossible d'acc辿der � l'annuaire"
-
-#~ 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."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Impossible de se connecter au serveur Gadu-Gadu. Veuillez r辿essayer plus "
-#~ "tard."
-
-#~ msgid "Directory Search"
-#~ msgstr "Recherche dans l'annuaire"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Impossible d'acc辿der au profil utilisateur"
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Impossible de se connecter au serveur annuaire. Veuillez r辿essayer plus "
-#~ "tard."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Erreur lors de la communication avec le serveur ICQ"
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "L'utilisateur %s (%s%s%s%s%s) veut que vous l'autorisiez."
-
-#~ msgid "Send message through server"
-#~ msgstr "Envoyer le message par le serveur"
-
-#~ msgid "Connecting..."
-#~ msgstr "Connexion..."
-
-#~ msgid "Nick:"
-#~ msgstr "Pseudo�:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Utilisateur de Gaim"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Transfert de fichier annul辿"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Informations sur %s"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Pseudonyme 束�%s�損 non valide"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Pseudonyme non valide"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Profil Jabber"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Erreur d'辿num辿ration des salons de discussion"
-
-#~ msgid "Logged out"
-#~ msgstr "D辿connect辿"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Cacher le syst竪me d'exploitation"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "L'utilisateur %s veut vous ajouter � sa liste de contacts."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Afficher les notifications de fin de conversation"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Afficher les notifications de d辿passement de temps"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "La conversation est devenue inactive ou a 辿t辿 coup辿e"
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s a ferm辿 sa fen棚tre de dialogue"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Vous avez 辿t辿 d辿connect辿 du serveur. Vous vous 棚tes connect辿 depuis un "
-#~ "autre endroit."
-
-#~ msgid "User Properties"
-#~ msgstr "Propri辿t辿s de l'utilisateur"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Transfert du fichier 束�%s�損 coup辿"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Vous avez 辿t辿 d辿connect辿. Vous vous 棚tes connect辿 avec ce pseudo depuis "
-#~ "un autre endroit."
-
-#~ msgid "Not specified"
-#~ msgstr "Non renseign辿"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "Informations ICQ pour %s�:"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Erreur 0x%04x�: Impossible d'afficher le pseudo parce que la version "
-#~ "demand辿e se finit par une espace."
-
-#~ msgid "Visible"
-#~ msgstr "Visible"
-
-#~ msgid "Available Message:"
-#~ msgstr "Message de disponibilit辿�:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Je travaille et j'esp竪re une diversion. D辿rangez-moi�!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Changer le message de disponibilit辿..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Impossible de quitter le salon"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Profil de base"
-
-#~ msgid "Profile Information"
-#~ msgstr "Informations sur le profil"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Messageries instantan辿es"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Je suis de"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Changer les donn辿es du profil Trepia"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Set Profile"
-#~ msgstr "Changer de profil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Visiter la page web"
-
-#~ msgid "Local Users"
-#~ msgstr "Utilisateurs locaux"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Plugin pour le protocole Trepia"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Vous venez d'棚tre d辿connect辿 � la suite d'une connexion depuis un autre "
-#~ "endroit."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Saisissez votre mot de passe"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s s'est connect辿"
-
-#~ msgid "%s signed on"
-#~ msgstr "%s vient de se connecter"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s vient de se d辿connecter"
-
-#~ msgid "%s signed off"
-#~ msgstr "%s a quitt辿"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s vient de se faire r辿primander par %s\n"
-#~ "Votre nouveau niveau d'avertissement est de %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "une personne anonyme"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s a invit辿 %s dans le salon de discussions %s�:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "D辿sol辿, je suis parti pour un moment."
-
-#~ msgid "Initiate Chat"
-#~ msgstr "Lancer une discussion"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "R辿ception d'une erreur HTTP. Veuillez la reporter."
-
-#~ msgid "Local Addressbook"
-#~ msgstr "Carnet d'adresses local"
-
-#~ msgid "Notification"
-#~ msgstr "Annonce"
--- a/po/he.po	Mon Feb 13 20:06:09 2006 +0000
+++ b/po/he.po	Mon Feb 13 21:34:34 2006 +0000
@@ -8,31 +8,26 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-28 11:00+0200\n"
-"Last-Translator: Shalom Craimer <scraimer at softhome dot net>\n"
+"POT-Creation-Date: 2006-02-13 00:14-0500\n"
+"PO-Revision-Date: 2005-11-22 11:00+0200\n"
+"Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# prev line added per "msgfmt" recommendation
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "����� ���廣�廬 廩����"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "�廖廬廨 ���廣�廬 ��廬�廡"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "�廖廬廨 廩����廬 �廬��廨�廬"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "�廖廬廨 ���� �����廨 ���廩"
+#: ../gaim.desktop.in.h:1
+msgid "Gaim Internet Messenger"
+msgstr "���� ��廖廨�� �����廨��"
+
+#: ../gaim.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr "��廖廨�� �����廨��"
+
+#: ../gaim.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "��廚廩廨廬 �廩��� ���廣�廬 ������廬 �廨� �廖廚廨 廨� 廩� 廚廨���廡����"
 
 #. *< type
 #. *< ui_requirement
@@ -40,53 +35,55 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "�廬��廨 ���廩 �廢�廨� �������廬"
+#: ../plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "���廡廬 �廢廚��"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "��廩廨 ��廬廡�� ��廬�, �廬��廨 ���廩 廣廢���廬"
-
-#: plugins/contact_priority.c:84
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "���廡 �廬 ��廢廚���� 廩�廩���� 廣� ����"
+
+#: ../plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "��廩 �廡廩廨 ������"
+
+#: ../plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "��廩 �廡廩廨 �廬廨�廡 ����廩�"
+
+#: ../plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "��廩 �廡廩廨 �廬廨�廡 ����廩� ���� ���廩�"
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "��廩 �廡廩廨 ����"
+
+#: ../plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "��廩 �廡廩廨 ����� ����廨"
+
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "廣廨�� ��廡�� 廩�廩 ��廩廬�廩 ��� ��廩廨..."
 
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "��廩 �廡廩廨 ����� ����廨:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "��廩 �廡廩廨 �廬廨�廡 ����廩�:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "��廩 �廡廩廨 ������:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "�廩廬�廩 ���廩 �廡廩廨 ���廨�� �廬���"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"��廩 �廡廩廨 廣� ���廡�� ��� ���� ���� �廣� �廣��廚�廬 �廨�廩��� ����. \n"
-"廣廨�� �廨�廨廬 ����� (���廬廡 = 4, �廨��廡 = 2, ��廖廨 廚廣���廬 = 1)\n"
-"�廩廬�廩� ��� 廩��� 廚廣� �廖�廨 ������ 廩�: 廚廣��, �� 廚廣��, �廨��廡, �廨��廡 + �� 廚廣��,-"
-"���廬廡."
-
-#: plugins/contact_priority.c:144
+#: ../plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"��廩 �廡廩廨 廣� ���廡�� <i>�����</i> ���� ��廩 �廡廩廨 廣� �廣��廚�廬.\n"
+
+#: ../plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "�廩廬�廩 ���廩 �廡廩廨 ���廨�� �廩���廡�� 廩���"
+
+#: ../plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "廣廨�� ���廡�� �廩���廩 廣��廨 ��廩���..."
 
@@ -96,20 +93,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "廩�� 廣��廚�廬"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "��廚廩廨 廩���� 廣� �廣廨��� �����廖�� ��廢��� �廩���� 廩� ��廩� �廡廩廨."
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:187
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -117,57 +114,56 @@
 "��廚廩廨 �廩��廬 �廬 廣廨�� ���廡�� ���廖廨 廚廣���廬/廨���廡/��廬�廡 �廩廨 �廣廩� �� 廩���廩 "
 "���廩��� ���廨�� 廩� ��廩� �廡廩廨."
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "����"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "���� - �廬�廬廡"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "���� - �� ����"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "廨廩��廬 ��廩� 廡廩廨"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "���廣� ��廩�..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "�廢�廨廝 �廩���..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "�廩廬廡 廢�����"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "�廩��� 廡�廢��"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "�廩����廬"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "�廣�廚�廬"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "�廢���"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "廡廨����-廢'��"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "廬�廖廝 ���廚廩廨 廬廡廩�廨廬 廡廨����-廢'��."
+
+#. *  description
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "�廩廬�廩 ����� ��廩�� �廬���廬 IP 廩� ��廨�� 廣��廨 廩��廬 廡廨����-廢'��"
+
+#. make the network configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "���廨�廬 廨廩廬"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "�廢��廬 TCP"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "�廢��廬 UDP"
+
+#. make the feature configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "������� �廚廩廨���廬"
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:577
+msgid "Enabled"
+msgstr "���廡"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "����"
 
 #. *< type
 #. *< ui_requirement
@@ -175,43 +171,192 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "����� �廬�廖廝 DBus"
+
+#: ../plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "���廢� ����廬 �廣�� ���廣�廬 廩�� �廡廨��...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3286
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d ���廣� 廩�� �廡廨�� �-%s\n"
+msgstr[1] "%d ���廣�廬 廩�� �廡廨�� �-%s\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "廩�� �廢�"
+
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:663
+#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
+#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
+#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
+#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:155
+msgid "Available"
+msgstr "����"
+
+#. Away stuff
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:664 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
+#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3187
+#: ../src/status.c:158
+msgid "Away"
+msgstr "廨��廡 ����廩�"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:665
+#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "��廬� �廨��"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3016
+#: ../src/gtkstatusbox.c:666 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:154
+msgid "Offline"
+msgstr "���廬廡"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:671
+msgid "New..."
+msgstr "��廩..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
+msgid "Saved..."
+msgstr "廩��廨..."
+
+#: ../plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "�廢� �廬 廨廩��廬 ��廩� 廡廩廨"
+
+#: ../plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "���廣�廬 廩�� �廡廨��"
+
+#: ../plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "���廣� ��廩�..."
+
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+msgid "Accounts"
+msgstr "�廩����廬"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+msgid "Plugins"
+msgstr "廬�廖廚��"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+msgid "Preferences"
+msgstr "�廣�廚�廬"
+
+#: ../plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "�廩廬廡 廢�����"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "�廢���"
+
+#: ../plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "���� �廬 �廖�� ���廩-��廣廨�廬 廣��廨 ���廣�廬 ��廩�廬..."
+
+#: ../plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr ":�廖_廨�� ������"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:411 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+msgid "Never"
+msgstr "�廣��� ��"
+
+#: ../plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "����廣�廬 ������廬"
+
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:825
+msgid "Always"
+msgstr "廬���"
+
+#: ../plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "���廣�廬 _廢'��:"
+
+#: ../plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "��廩廨 ���廨�� �廬 廩��"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "廖�� ��廩 ��廣廨�廬"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "�廢� 廖�� 廩� ���� ���廩 ��廣廨�廬"
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
 msgstr ""
 "�廢�� 廖�� ����廨 ��廬廨廣� )������: 廩� GNOME, KDE �� Windows( 廩�廨�� �廬 ��廢� "
-"������, ��廚廩廨 ��廩� ���廨� � 廚廣���廬 ��廚�廢�廬 ���廬廨, �廢��/�廖廬廨� 廩� ���� \"廨廩��廬 "
+"������, ��廚廩廨 ��廩� ���廨� �廚廣���廬 ��廚�廢�廬 ���廬廨, �廢��/�廖廬廨� 廩� ���� \"廨廩��廬 "
 "��廩� 廡廩廨\". ��� �� ��廬� �廚廩廨�廬 ��廨�� ����廣�廬 ���廖�廬 ���廬�� �廬�廨 廣� ���廢� 廣� "
-"�廖�� ����廨 ��廬廨廣� - ��� �- ICQ"
-
-#: plugins/extplacement.c:79
+"�廖�� ����廨 ��廬廨廣�."
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "�����"
+
+#: ../plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "����� ��廩 ��廣廨�廬"
+
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "廣廚\"� �廖廚廨 �廩���廬"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "��廡�� ���� 廩���"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "�廖廚廨 廩���廬 ��� ����"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "�廚廨� ��� ���廣�廬 �廢����� ��廩廨 ��廡��� 廣廚\"� �廖廚廨"
 
@@ -221,19 +366,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "廣�-��廡��"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "�廚廩廨���廬 ��廖廚�廬 ���廡�� 廩���廬"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -245,7 +390,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "����� �廡廨廬 廡�廢��"
 
@@ -253,7 +398,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��廚廩廨 �� �廩��� ����� 廣\"� ���廖廬 廚廡���廬 �廡��廛."
 
@@ -263,19 +408,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "廬�廖廝 ����� 廩� ����"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "廬�廖廝 ����� 廩廣�廩� ��廨�� - 廨�� 廬���廨."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -287,91 +432,128 @@
 "- �� ��廚� �廬 �� ��廡廖� ����廖\n"
 "- �� 廩��� ���廣� ���廩� �廡廩廨 �廨�廣 廩�� �廬��廨��"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
 msgstr "廢�廣 �廖��"
 
-#: plugins/gaimrc.c:41
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "廢�廣 �廩�� 廩� �廖��"
 
-#: plugins/gaimrc.c:42
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "廢�廣 廡�廩�廨��"
 
-#: plugins/gaimrc.c:53
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
 msgstr "���� ��廨���"
 
-#: plugins/gaimrc.c:72
+#: ../plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "�廚廨�� ��廚廡�"
+
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
 msgstr "���廬 廩���廬"
 
-#: plugins/gaimrc.c:73
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
 msgstr "���� 廩���廬"
 
-#: plugins/gaimrc.c:74
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
 msgstr "�廢�廚� �������"
 
-#: plugins/gaimrc.c:75
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
 msgstr "���� �廡廩�"
 
-#: plugins/gaimrc.c:76
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
 msgstr "���� �廬廨廣�廬"
 
-#: plugins/gaimrc.c:209
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "�廨���� ���� ���廖�"
+
+#: ../plugins/gaimrc.c:287
 #, c-format
 msgid "Select Color for %s"
 msgstr "���廨廬 廢�廣 廣��廨 %s"
 
-#: plugins/gaimrc.c:211
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
 msgstr "���廨廬 廢�廣"
 
-#: plugins/gaimrc.c:246
+#: ../plugins/gaimrc.c:324
 #, c-format
 msgid "Select Font for %s"
 msgstr "���廨廬 ��廚� 廣��廨 %s"
 
-#: plugins/gaimrc.c:284
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
 msgstr "���廨廬 ��廚� ��廩廡"
 
-#: plugins/gaimrc.c:343
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "����"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
 msgstr "��廚� ���廩廡 廩� GTK+"
 
-#: plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr "����� 廡�廢�廨 ��廨� ��廡廖����� 廩� GTK+"
 
-#: plugins/gaimrc.c:460
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "廢�廣� ��廩廡"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "���� 廚廨��� ��廩廡"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "��廚���"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "����"
+
+#: ../plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "廩��廨 ���廨�廬 �廬�� %s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:556
+msgid "Re-read gtkrc files"
+msgstr "廡廨�-���廩 廡�廢� gtkrc"
+
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
 msgstr "�廡廨廬 ������� 廩� GTK+ �����"
 
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "�廩 ��廚廩廨 ��廩� ����廨�廬 �廚�廢�廬 廩� gtkrc"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "���廨�廬 廚廣���廬 �廣��廨"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "��廢� ��廢廣� 廩� �廣��廨"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "��廢� ���� 廩� �廣��廨"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "�廢� 廚廣���廬 �廣��廨 �廢�廨� ��������廬"
 
@@ -381,19 +563,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "廚廣���廬 廣��廨"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "��廖�廝 廬���� �廚廣���廬 廣��廨"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -408,47 +590,49 @@
 "�廨�廨/� �廣�� ��� 廩���� �廣��廨 �廩��� �廡���廬.\n"
 "�廨�廨/� �廣�� ��� ����� �廣��廨 �廩��� ����."
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1524
 msgid "Name"
 msgstr "廩�"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "�廖廨�� ������"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 msgid "Select a person from your address book below, or add a new person."
 msgstr "��廨 �廩廬�廩 �廨廩��廬 ��廬���廬 廩����, �� ��廖廝 ��廩."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/sametime/sametime.c:5533
 msgid "Search"
 msgstr "��廚�廩"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4919
 msgid "Group:"
 msgstr "廡��廢�:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "��廩��廬 ��廩�"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "��廨 ��廩 廡廩廨"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -457,53 +641,59 @@
 "��廩"
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "�廖廬廨 廚廨�� ��廩廬�廩"
+msgstr "廚_廨�� ��廩廬�廩"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "廩��� ��廩 _廡廩廨"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1122
+msgid "None"
+msgstr "���"
+
+#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
+#: ../src/gtkblist.c:4364 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "��廩� 廡廩廨"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "�� ��廬� �廩��� ���廣廬 ���\"�"
 
-#: plugins/gevolution/gevolution.c:263
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
 msgstr "廬���廬 ��廨廢� 廩� evolution �� ��廢�� ��廬��� �-PATH."
 
-#: plugins/gevolution/gevolution.c:269
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
 msgstr "��廩 �廡廩廨 ��廖��� �� ��廢� �廨廩��廬 ��廩� �廡廩廨 廩� Evolution."
 
-#: plugins/gevolution/gevolution.c:286
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "��廖廝 �廚�廡廖 ��廬���廬"
 
-#: plugins/gevolution/gevolution.c:290
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "廩�� ���\"�"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "���廨�廬 廩���� 廣� Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "��廨 �廬 �� ��廩����廬 廩����� ��廩�-廡廩廨 �廬��廖廚� �������廬."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
 msgid "Account"
 msgstr "�廩���"
 
@@ -513,7 +703,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "廩���� 廣� Evolution"
 
@@ -521,54 +711,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "��廚廩廨 廩���� 廣� Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "��� ��� ���� �廬 廚廨�� ����."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "��� ��� ���� �廬 �廩� �廬廢��� �廖�� �廩��� ��廩 �廡廩廨"
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "廖�� �廩���:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+msgid "Screen name:"
 msgstr "廩� �廬廢���:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "���廣 ��廖廝:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
 msgid "Buddy Icon"
 msgstr "廖�� ��廩 �廡廩廨"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "廩� 廚廨��:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "廩� �廩廚��:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "���\"�:"
 
-#: plugins/history.c:146
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "���廡廬 ��廨�廣� GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "���廡 廩�� ���廨�廣� ���廩廡 廣����� ��� 廩廢廨��"
+
+#: ../plugins/history.c:143
 msgid "History Plugin Requires Logging"
 msgstr "廬�廖廝 ���廖��廨�� ��廨廩 廨�廩�� ������"
 
-#: plugins/history.c:147
+#: ../plugins/history.c:144
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -579,27 +788,19 @@
 "\n"
 "��廚廩�廨 ������ ����廣�廬 �/�� 廢'���� �廚廣�� ��廖��廨�� 廣��廨 ��廬� 廖��� 廩���廬."
 
-#: plugins/history.c:186
+#: ../plugins/history.c:184
 msgid "History"
 msgstr "��廖��廨��"
 
-#: plugins/history.c:188
+#: ../plugins/history.c:186
 msgid "Shows recently logged conversations in new conversations."
 msgstr "�廢�� 廩���廬 ��廨���廬 ������廬 廩��� ��廩�廬."
 
-#: plugins/history.c:189
+#: ../plugins/history.c:187
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-"廬�廖廝 ���廖��廨�� ��廨廩 廩����� 廨�廩�� ���� 廚廣����. ��廬� ��廚廩廨 廨�廩�� �廬�� ���� -> "
-"�廣�廚�廬 -> 廨�廩��.\n"
-"\n"
-"��廚廩�廨 ������ ����廣�廬 �/�� 廢'���� �廚廣�� ��廖��廨�� 廣��廨 ��廬� 廖��� 廩���廬."
+"conversation into the current conversation."
+msgstr "��廩廨 ���� 廩��� ��廩 �廚廬�, 廬�廖廝 �� ����廖 �廬 �廩��� ���廨��� �廨�廩 �����."
 
 #. *< type
 #. *< ui_requirement
@@ -607,7 +808,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "��廣廨 �廣廬 �廬廨�廡�廬 ����廩�"
 
@@ -615,46 +816,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "���廣廨 �廬 廨廩��廬 ��廩� �廡廩廨 ������廬 �廩��� �廣廬 �廬廨�廡�廬 ����廩�."
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "�廡�廬"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
+#: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
 msgstr "��� 廨�廢� ����"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: ../plugins/idle.c:160 ../plugins/idle.c:249
 msgid "Set Account Idle Time"
 msgstr "廡�廣 �廬 ��� ��廖廨 廚廣���廬 廩� ��廩���"
 
-#: plugins/idle.c:126
+#: ../plugins/idle.c:163 ../plugins/idle.c:221
 msgid "_Set"
 msgstr "_廡�廣"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
 msgid "_Cancel"
 msgstr "�����"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: ../plugins/idle.c:177
+msgid "None of your accounts are idle."
+msgstr "�廝 ��� �� ��廩����廬 廩�� �廖廨-廚廣���廬."
+
+#: ../plugins/idle.c:193 ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
-msgstr "廡�廣 �廬 ��� ��廖廨 廚廣���廬 廩� ��廩���"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "��� �廬 ��� ��廖廨 廚廣���廬 廩� ��廩���"
+
+#: ../plugins/idle.c:196
 msgid "_Unset"
-msgstr "���"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "�_��"
+
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "廡�廣 �廬 ��� ��廖廨 �廚廣���廬 廣��廨 �� ��廩����廬"
+
+#: ../plugins/idle.c:262
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "��� �廬 ��� ��廖廨 �廚廣���廬 廣��廨 �� ��廩����廬"
+
+#: ../plugins/idle.c:308 ../plugins/idle.c:309
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "��廚廩廨 �����廨 ����廬 ��� ��� ��廩��� ���廖廨 廚廣���廬"
 
@@ -664,24 +871,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "�廡�� ����廡廬 IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "���廡 廬���� �-IPC, ��廡��."
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"���廡 �廬 廬�廖廝 �廬���� �-IPC, ��廡��. �� ��廬廨 �廬 �廩廨廬 廩� �廬�廖廝�廡�廨� �廚廡���廬 "
+"���廡 �廬 廬�廖廝 �廬���� �-IPC, ��廡��. �� ��廬廨 �廬 �廩廨廬 廩� �廬�廖廝 �廡�廨� �廚廡���廬 "
 "�廨廩���廬."
 
 #. *< type
@@ -690,102 +897,278 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "廩廨廬 ���廡廬 IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "���廡 �廬 廬�廖廝 �廬���� �-IPC, �廬�廨 廩廨廬."
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "���廡 �廬 廬�廖廝 �廬���� �-IPC, �廬�廨 廩廨廬. �� 廨�廩� �廬 廚廡���廬 �-IPC."
 
-#: plugins/mailchk.c:160
+#: ../plugins/log_reader.c:1407
+msgid "User is offline."
+msgstr "��廩廬�廩 �� ����廨"
+
+#: ../plugins/log_reader.c:1413
+msgid "Auto-response sent:"
+msgstr "�廩��� 廬���� �������廬:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#, c-format
+msgid "%s logged out."
+msgstr "%s �廬�廬廡."
+
+#: ../plugins/log_reader.c:1440
+msgid "One or more messages may have been undeliverable."
+msgstr "��廬 �� ��廬廨 �� ����廣�廬 �� ��廬�� �廩����."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "��廬廡廬 ��廩廨廬."
+
+#: ../plugins/log_reader.c:1458
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"�廬/� �廨�廣 ���廬廡/廬. ���廣�廬 �� �廬廡��� ��� 廨廡 ���� 廩�廬/� ����廨/廬."
+
+#: ../plugins/log_reader.c:1473
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廨� ����廣廬 ��廬廨 ����廬廨."
+
+#: ../plugins/log_reader.c:1478
+msgid "Message could not be sent."
+msgstr "����廣� �� �廩���."
+
+#. Add general preferences.
+#: ../plugins/log_reader.c:1912
+msgid "General Log Reading Configuration"
+msgstr "���廨�廬 �����廬 �廡廨��廬 ���� ��廨�廣��"
+
+#: ../plugins/log_reader.c:1916
+msgid "Fast size calculations"
+msgstr "��廩��� ���� ���廨��"
+
+#: ../plugins/log_reader.c:1920
+msgid "Use name heuristics"
+msgstr "�廩廬�廩 ����廨�廖��廡� �廩��廬"
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1926
+msgid "Log Directory"
+msgstr "廖廚廨��廬 ���� ��廨�廣��"
+
+#: ../plugins/log_reader.c:1930
+msgid "Adium"
+msgstr "Adium"
+
+#: ../plugins/log_reader.c:1934
+msgid "Fire"
+msgstr "Fire"
+
+#: ../plugins/log_reader.c:1938
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: ../plugins/log_reader.c:1942
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: ../plugins/log_reader.c:1946
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/log_reader.c:1969
+msgid "Log Reader"
+msgstr "�廢�廚� �������"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../plugins/log_reader.c:1973
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "���� ������ 廩� 廬����廬 廢'�� ��廨�廬 �廢�廚�-�������."
+
+#. * description
+#: ../plugins/log_reader.c:1977
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+"�廣廬 廢廚��� ������-廩���, 廬�廖廝 �� ����� ������ �廬����廬 廢'�� ��廨�廬. "
+"�廨�廣, �� ���� Adium, Fire, Messenger Plus!, MSN Messenger, Trillian."
+
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "���廡 ����廨"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "���廡 廣��廨 ���廨 �廡��� ��廩"
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "��廖�廝 �廡�� �廨廩��廬 ��廩� 廡廩廨 �廩廨 �廢�� �� ���廖 �� ���廨 ��廩."
 
+#: ../plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "�廩廝 ��廣�廬 廬�廖廚� Mono"
+
+#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "��廣� 廬�廖廚� .NET 廣� Mono."
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"�廬廡��� �廡廩� �廩��廬 ����廡�. �� ����廛 廣� �廚廬�廨 �-MM ��廖���."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "廬廡廩�廨廬 廩��廬 ��廖�廡� ��廩���."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "�廖廨� ����廡�"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "��� 廡��廚��廡� �廣廬 �廚廣�廬 �廚廡���:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "廩���� ��廨廢廬 �廣�廨� "
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "�廨廣� �廩���� ����:"
+
+#. Configuration frame
+#: ../plugins/musicmessaging/musicmessaging.c:623
+msgid "Music Messaging Configuration"
+msgstr "���廨�廬 ���廣�廬 ��廖�廡�"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "��廡�� 廣�廨� ���廡��"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+msgid "_Apply"
+msgstr "_���"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "廬�廖廝 ����廣�廬 ����廡� ������ �廩�廬廚廬."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"�廬�廖廝 ����廣�廬 ����廡� ��廚廩廨 ��廖廚廨 �廩廬�廩�� �廣��� ��� 廣� ����廬 �廢�廨� "
+"���� ��廬."
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "�廬廨廣� 廣�"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "�����廬 ���廣�"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "�����廬 _廩���"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t廨廡 ��廩廨 ��廩�� ����廨 �廬 廩��"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "�����廬 廚廣����"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "廩���廬 �廬廨廣�"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "��廖廝 ��廨��廬 �廚�� 廬���廬 ��廬廨廬 �����:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "���廖 �廖_廚廨 ����廣�廬 ���廩�廬 �廬�� ��廬廨廬 �����"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "廡�廣 �廬 廨�� �-\"URGENT\" 廩� ���� ������廬"
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
 msgstr "�廢_� �����廬 廩��� �廣� ��廨��"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "�廖廨廬 �廬廨廣�廬"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "�廖廨 ��廩廨 ���� �_廩��� ��廚� ����� �廚廣��"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "�廖廨 ��廩廨 ���� �廩��� ���廛 廣� �_廣��廨"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "�廖廨 ��廩廨 �_廡����� ����� �廩���"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "�廖廨 ��廩廨 �廩�_�廬 ���廣�"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "�廖廨 �廣廬 �廣�廨 �_��� 廩� 廩���"
 
@@ -795,7 +1178,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "�廬廨廣� 廣� ���廣�"
 
@@ -803,7 +1186,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��廚廩廨 ���廨 �廨��� �����廣 �� 廣� ���廣�廬 ��廩�廬."
 
@@ -813,26 +1196,58 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "廬�廖廝 ��廚廣�廬 廬����廬 Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "��廚廩廨 �廣��� 廩� 廬�廖廚� Perl."
 
-#: plugins/raw.c:151
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "�廢� ����-廣廬���廬"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "�廢� ����-廣廬���廬 �廩���廬 ���廖�廬"
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  "
+"�� 廣��� 廣��廨 AIM, ICQ, Jabber, Sametime, Yahoo!"
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "�廬� �廨��廩 �廚廨廣� ����..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "�廚廩廨 廨廡 廣��廨 �廩廬�廩�� �廨廩��廬 ��廩�-�廡廩廨 廩��"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "��� ��廩廨 �廨��廡 ����廩�"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "�廢� ���廣廬 �廬廨廣� �廩���廬"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
-msgstr "����� "
-
-#: plugins/raw.c:153
+msgstr "�����"
+
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖�."
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -840,12 +1255,12 @@
 "��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖� ���� Jabber, MSN, IRC, "
 "TOC.��廛 'Enter' �廬��廬 ����� �廩���. 廢廚� ����� ��廚�� ������."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "����� 廩�廩���廩 ��� ��廨廖� %s. ���廨廖� ������廬 ��� %s<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -854,7 +1269,7 @@
 "<b>廨廩��廬 廩������:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -863,7 +1278,7 @@
 "��廬� ��廩�� �廬 ��廨廖� %s �:<br><a href=\"http://gaim.sourceforge.net/\">http://"
 "gaim.sourceforce.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "廡���廬 ��廨廖� ��廩�"
 
@@ -873,19 +1288,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "�廬廨廣� 廣� �廨廖��廬 ��廩�廬"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "���廡 ���-廚廣� �� �廢�� �廨廖��廬 ��廩�廬."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -898,7 +1313,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:674
 msgid "Signals Test"
 msgstr "���廡廬 ��廨�廣��"
 
@@ -906,7 +1321,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:677 ../plugins/signals-test.c:679
 msgid "Test to see that all signals are working properly."
 msgstr "���廡 廩�� ���廨�廣�� 廣����� ��� 廩廢廨��."
 
@@ -916,7 +1331,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "廬�廖廝 廚廩��"
 
@@ -924,57 +1339,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "���廡 �� 廨�� ���廨�� 廣�����"
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1902
 msgid "Duplicate Correction"
 msgstr "�廚���廬 �廬�廡����"
 
-#: plugins/spellchk.c:1789
+#: ../plugins/spellchk.c:1903
 msgid "The specified word already exists in the correction list."
 msgstr "����� ��廬��� ��廨 廡���廬 �廨廩��廬 �廬�廡����"
 
-#: plugins/spellchk.c:1948
+#: ../plugins/spellchk.c:2112
 msgid "Text Replacements"
 msgstr "���廚�廬 �廡廖�"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2135
 msgid "You type"
 msgstr "�廬� 廨�廩�"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2149
 msgid "You send"
 msgstr "�廬� 廩���"
 
-#: plugins/spellchk.c:1996
-#, fuzzy
+#: ../plugins/spellchk.c:2163
 msgid "Whole words only"
-msgstr "�廩�� �����"
-
-#: plugins/spellchk.c:2022
+msgstr "����� 廩���廬 ����"
+
+#: ../plugins/spellchk.c:2175
+msgid "Case sensitive"
+msgstr "����� ��� �����廬/廡���廬"
+
+#: ../plugins/spellchk.c:2201
 msgid "Add a new text replacement"
 msgstr "��廖廝 �廡廖� ����廚�"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2217
 msgid "You _type:"
 msgstr "�廬� 廨_�廩�:"
 
-#: plugins/spellchk.c:2048
+#: ../plugins/spellchk.c:2234
 msgid "You _send:"
 msgstr "�廬� _廩���:"
 
-#: plugins/spellchk.c:2060
-#, fuzzy
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2246
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_�廬��� ����廡廬 (�廖廨 廖���� ���廚�� �������)"
+
+#: ../plugins/spellchk.c:2248
 msgid "Only replace _whole words"
 msgstr "廨廡 ���廝 ����� 廩_���廬"
 
-#: plugins/spellchk.c:2097
+#: ../plugins/spellchk.c:2273
+msgid "General Text Replacement Options"
+msgstr "�廚廩廨���廬 �����廬 ����廚廬 �廡廖�"
+
+#: ../plugins/spellchk.c:2274
+msgid "Enable replacement of last word on send"
+msgstr "�廚廩廨 ���廚� 廩� ����� ���廨��� �廣廬 廩����"
+
+#: ../plugins/spellchk.c:2299
 msgid "Text replacement"
 msgstr "���廚廬 ��廡廖�"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2301 ../plugins/spellchk.c:2302
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "����廝 �廡廖� ����廣�廬 ��廢��廬 廣廚\"� ��廡�� 廩�廡�廣�� 廣\"� ��廩廬�廩."
 
@@ -984,7 +1414,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -992,7 +1422,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "�廖廚廡 廬���� �-SSL �廨� GNUTLS."
 
@@ -1002,7 +1432,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1010,7 +1440,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "�廖廚廡 廬���� �-SSL �廨� ������ NSS."
 
@@ -1020,7 +1450,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1028,49 +1458,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�廖廚廡 廩���廬 �廣�廚廬 廖��� 廖廚廨��廬 �廬���� �-SSL."
 
-#: plugins/statenotify.c:42
+#: ../plugins/statenotify.c:49
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s ��廨 �� �廨��廡/廬 ����廩�"
+
+#: ../plugins/statenotify.c:51
 #, c-format
 msgid "%s has gone away."
 msgstr "%s �廬廨�廡/� ����廩�"
 
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s ��廨 �� �廨��廡/廬 ����廩�"
-
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s �廖廨/廬 廚廣���廬"
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ��廨 �� �廖廨/廬 廚廣���廬"
 
-#: plugins/statenotify.c:74
+#: ../plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s �廬��廨."
+
+#: ../plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s �廬�廬廡."
+
+#: ../plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "�廬廨廣 ��廩廨"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "�廬廨�廡/� ����廩� ��廩 �廡廩廨"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "��廩 �廡廩廨 �廖廨 廚廣���廬"
 
+#: ../plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "��廩 廡廩廨 _�廬��廨/�廬�廬廡"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:141
 msgid "Buddy State Notification"
 msgstr "�廬廨廣�廬 廣� �廢� ��廩� �廡廩廨"
 
@@ -1078,7 +1522,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1086,11 +1530,11 @@
 "����廣 ����� �廩��� ��廩廨 ��廩 �廡廩廨 �廬廨�廡 ���廬�廩�, 廣��廨 ��廢� 廩� ���廨 廚廣���廬, �� "
 "���廨."
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "��廣�� �廬�廖廚� Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "�廖廚廡 廬���� ��廣��廬 廬�廖廚� Tcl"
 
@@ -1100,7 +1544,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "��廡廨 ��廩� 廡廩廨"
 
@@ -1108,19 +1552,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "��廨廖� �����廬 (��廡�� �����廬) 廩� ��廩� �廡廩廨, 廩�廣��廨� �廬 ���� �廖�."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:188
 msgid "iChat Timestamp"
 msgstr "���廣 ��廬�廬 ��� �廖�� iChat"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:195
 msgid "Delay"
 msgstr "�廩����"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:202
 msgid "minutes."
 msgstr " �廡�廬"
 
@@ -1130,7 +1574,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:264
 msgid "Timestamp"
 msgstr "��廬�廬 ��� "
 
@@ -1138,53 +1582,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "��廖�廝 ��廬�廬 ��� ��廖�� 廩�廩 �-iChat �廩���廬, �� ��� �廡�廬."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "廩廡�廚�廬:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "�����廬 廩��� ����廣�廬"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "廩廡�廚�廬 �����廬 廩���"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "�廢� 廚廖 ���� ������廬 廩���"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "廩廡�廚�廬 �����廬 廩���"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
-msgid "Always on top"
-msgstr "廬���"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "���� 廨廩��廬 ��廩� �廡廩廨"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "���� 廨廩��廬 ��廩� �廡廩廨 廬��� 廣����"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "���� 廨廩��廬 ��廩� �廡廩廨 廬��� 廣����"
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "�廚廩廨���廬 ��廬�廬-���"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_��廛 廩���廩 ���廬�廬-��� 廣� �廖�廖 24-廩廣�廬"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "�廢� 廬�廨���� �..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr ":廩_���廬"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "���廣�廬 �廬廣���廬"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "����廣�廬 �廬廣���廬 ��廢'����"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "廨�廩�� ���� ���廣�廬:"
 
 #. *< type
 #. *< ui_requirement
@@ -1192,20 +1620,85 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "���廨�廬 ��廬�廬-��� ����廣�廬"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "����廨 �廬 廚�廨�� ��廬��廬-���� ����廣�廬."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"廬�廖廝 �� ��廚廩廨 ��廩廬�廩 �廡��廣 �廚廩廨���廬 廩��� ���廬��廬-��� ������ 廩���."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "廩廡�廚�廬:"
+
+#. IM Convo trans options
+#: ../plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "�����廬 廩��� ����廣�廬"
+
+#: ../plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "廩廡�廚�廬 �����廬 廩���"
+
+#: ../plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "�廢� 廚廖 ���� ������廬 廩���"
+
+#: ../plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "��� 廩廡�廚�廬 �����廬 ���廣� �廣廬 �廚��廬� �廚廣����"
+
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "廬��� �廣�"
+
+#. Buddy List trans options
+#: ../plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "���� 廨廩��廬 ��廩� �廡廩廨"
+
+#: ../plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "���� 廨廩��廬 ��廩� �廡廩廨 廬��� 廣����"
+
+#: ../plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr " ��� 廩廡�廚�廬 ���� 廨廩��廬 ��廩� �廡廩廨 �廣廬 �廚��廬� �廚廣�� "
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "廩廡�廚�廬"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "廩廡�廚�廬 �廩廬�� 廣��廨 廨廩��廬 ��廩� �廡廩廨 ������廬 �廩���."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1214,67 +1707,59 @@
 msgstr ""
 "廬�廖廝 �� ��廚廩廨 廩廡�廚�廬 �廩廬�� 廣� �����廬 廩��� ����� 廨廩��廬 ��廩� �廡廩廨.\n"
 "\n"
-"* �廣廨�: 廬�廖廝 �� ��廨廩 �����廬 2000 �� XP."
-
-#: plugins/win32/winprefs/winprefs.c:385
+"* �廣廨�: 廬�廖廝 �� ��廨廩 �����廬 2000 ��廣��."
+
+#: ../plugins/win32/winprefs/winprefs.c:384
 msgid "GTK+ Runtime Version"
 msgstr "�廨廖廬 �廨廢� 廩� GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:392
 msgid "Startup"
 msgstr "�廚廣��"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:393
 msgid "_Start Gaim on Windows startup"
 msgstr "�廚廣� �廬 Gaim �廣廬 �廚廣�廬 �����廬"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:404 ../src/gtkblist.c:3608
 msgid "Buddy List"
 msgstr "廨廩��廬 ��廩� 廡廩廨"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:405
 msgid "_Dockable Buddy List"
 msgstr "廨廩��廬 ��廩� �廡廩廨 �廨-廣����"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
+#: ../plugins/win32/winprefs/winprefs.c:409
 msgid "_Keep Buddy List window on top:"
 msgstr "���� 廩���� 廨廩��廬 ��廩� �廡廩廨 廬��� 廣���_�:"
 
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "�廣��� ��"
-
-#: plugins/win32/winprefs/winprefs.c:413
-msgid "Always"
-msgstr "廬���"
-
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:414
 msgid "Only when docked"
 msgstr "廨廡 �廣����"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:418 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "廩���廬"
 
-#: plugins/win32/winprefs/winprefs.c:420
+#: ../plugins/win32/winprefs/winprefs.c:419
 msgid "_Flash window when messages are received"
 msgstr "_���� �廬 ���� �廩��� �廣廬 廡��廬 ���廣�廬"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "WinGaim Options"
 msgstr "�廚廩廨���廬 ���� ������廬"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:444
 msgid "Options specific to Windows Gaim."
 msgstr "�廚廩廨���廬 ����� �������廬 ������廬"
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:445
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1282,223 +1767,231 @@
 "��廚廩廨 ��廩� ��廚廩廨���廬 ��������廬 ����� ������廬, ���� 廣���� 廩� 廨廩��廬 ��廩� �廡廩廨 "
 "������ �����廬 廩���."
 
-#: src/account.c:773
+#: ../src/account.c:773
 msgid "accounts"
 msgstr "�廩����廬"
 
-#: src/account.c:915
+#: ../src/account.c:923
 msgid "Password is required to sign on."
 msgstr "廖廖�廬� ���廢� ��廬��廨�廬."
 
-#: src/account.c:940
+#: ../src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "��� 廖�廖�� 廣��廨 %s (%s)"
 
-#: src/account.c:947
+#: ../src/account.c:955
 msgid "Enter Password"
 msgstr "��� 廖�廖��"
 
-#: src/account.c:952
+#: ../src/account.c:960
 msgid "Save password"
 msgstr "廩��廨 ��廩�"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
+#: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
+#: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
+#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/xdata.c:337 ../src/protocols/msn/msn.c:250
+#: ../src/protocols/msn/msn.c:265 ../src/protocols/msn/msn.c:280
+#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2999
+#: ../src/protocols/oscar/oscar.c:4542 ../src/protocols/oscar/oscar.c:4623
+#: ../src/protocols/oscar/oscar.c:8051 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:8199 ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1182
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:749
+#: ../src/protocols/yahoo/yahoo.c:3061 ../src/protocols/yahoo/yahoo.c:3070
 msgid "OK"
 msgstr "��廩�廨"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4960
+#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:777
+#: ../src/gtkdialogs.c:796 ../src/gtkdialogs.c:818 ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:882 ../src/gtkdialogs.c:937 ../src/gtkdialogs.c:974
+#: ../src/gtkdialogs.c:999 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
+#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
+#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
+#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
+#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/oscar/oscar.c:3000
+#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
+#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5321
+#: ../src/protocols/sametime/sametime.c:5410
+#: ../src/protocols/sametime/sametime.c:5534 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
+#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071
 msgid "Cancel"
 msgstr "�����"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:994 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�廖廨 廬�廖廝 �廚廨���廡�� 廣��廨 %s"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3496
 msgid "Connection Error"
 msgstr "廩��廣廬 �廬��廨�廬"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "�廖�廖�� ���廩� ������� ���� 廬�����."
 
-#: src/account.c:1061
+#: ../src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "�廩 ���� �廬 �� 廩��廬 ���廚廖."
 
-#: src/account.c:1085
+#: ../src/account.c:1108
 msgid "Original password"
 msgstr "廖�廖�� �廡�廨�廬"
 
-#: src/account.c:1092
+#: ../src/account.c:1115
 msgid "New password"
 msgstr "廖�廖�� ��廩�"
 
-#: src/account.c:1099
+#: ../src/account.c:1122
 msgid "New password (again)"
 msgstr "��� 廖�廖�� ��廩�"
 
-#: src/account.c:1105
+#: ../src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "廩�� 廖�廖�� 廣��廨 %s"
 
-#: src/account.c:1113
+#: ../src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "��� ��� �廬 廖�廖�廬� ������廬 �廖�廖�廬� ���廩�:"
 
-#: src/account.c:1146
+#: ../src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "廩�� 廚廨�� �廩廬�廩 廣��廨 %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
+#: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "廩��廨"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: ../src/account.c:1671 ../src/gtkft.c:157
+#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
+#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "�� ���廣"
 
-#: src/blist.c:545
+#: ../src/blist.c:543
 msgid "buddy list"
 msgstr "廨廩��廬 ��廩� 廡廩廨"
 
-#: src/blist.c:1162
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "廩���廬"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1886
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
-"%d ��廩 廡廩廨 �� ��廖廨 �廡��廢� %s ����� 廩��廩��� 廩�� �� ����廨.��廩 廡廩廨 �� ��廡��廢� "
-"�� ��廖廨�.\n"
+"%d ��廩 廡廩廨 ��廡��廢� %s �� ��廖廨 ������ 廩��廩��� ���� ��� 廩���.��廩� "
+"�� ����廨. ��廩 廡廩廨 �� ��廡��廢� �� ��廖廨.\n"
 msgstr[1] ""
-"%d ��廩� 廡廩廨 ��廡��廢� %s �� ��廖廨� ������ 廩��廩����廬 廩��� �� ��� ����廨��.��廩� "
-"廡廩廨 ��� ��廡��廢� �� ��廖廨�.\n"
-
-#: src/blist.c:1872
+"%d ��廩� 廡廩廨 ��廡��廢� %s �� ��廖廨� ������ 廩��廩����廬 ����� �� 廩�����.��廩� "
+"�� ����廨��. ��廩� 廡廩廨 ��� ��廡��廢� �� ��廖廨�.\n"
+
+#: ../src/blist.c:1896
 msgid "Group not removed"
 msgstr "�廡��廢� �� ��廖廨�"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "廩���廬 廨�廩��"
 
-#: src/conversation.c:205
+#: ../src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s �廬��廨"
+
+#: ../src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s �廬�廬廡"
+
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
 msgstr "�� ��廬� �廩��� �廬 ����廣�: ����廣� �廨��� ���."
 
-#: src/conversation.c:208 src/conversation.c:221
+#: ../src/conversation.c:166 ../src/conversation.c:179
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "�� ��廬� �廩��� ���廣� � %s."
 
-#: src/conversation.c:209
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "����廣� �廨��� ���."
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "�� ��廬� �廩��� ���廣�"
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ���廖 ���廨"
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ���廖 ���廨."
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "%s ���廣 �廣廬 �廩� �廬�"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ���廣 �廣廬 �廩� %s"
 
-#: src/conversation.c:1669
+#: ../src/conversation.c:1720
+#, c-format
+msgid "%s left the room."
+msgstr "%s 廣�� �廬 ���廨"
+
+#: ../src/conversation.c:1723
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 廣�� �廬 ���廨 (%s)."
 
-#: src/conversation.c:1671
-#, c-format
-msgid "%s left the room."
-msgstr "%s 廣�� �廬 ���廨"
-
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d ��廖廚��)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr ".(%s) 廣�� �廬 ���廨"
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+msgid "No name"
+msgstr "��� 廩�"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1507,7 +2000,7 @@
 "廩���� �廡廨��� %s: \n"
 "%s.\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1516,7 +2009,7 @@
 "廩���� ��廬��� %s: \n"
 "%s.\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1525,35 +2018,35 @@
 "廩���� ���廩� �- %s: \n"
 "%s.\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "�� ���� �廩��� 廡��廛 ����� 廩� 0 ��廬��"
 
-#: src/ft.c:239
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "�� ���� �廩��� 廖廚廨���"
 
-#: src/ft.c:248
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ���� 廡��廛 廨���. �廖廨� �廚����廬 ��廬�� 廣���.\n"
 
-#: src/ft.c:306
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 廨�廢� �廩��� �� %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 廨�廢� �廩��� �� 廡��廛"
 
-#: src/ft.c:354
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "��� �廨廢��� �廡�� �廬 ��廡廩� ��廣�廨廬 廡��廛 �-%s?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1564,65 +2057,65 @@
 "廩廨廬 �廨��廡: %s\n"
 "�廢��� �廨��廡廬: %d"
 
-#: src/ft.c:382
+#: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s �廢�廣/� �廩��� 廡��廛 %s"
 
-#: src/ft.c:422
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ���� 廩� ��廡� �廡��廛.\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:463
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "�廢�廣 �廩��� %s �-%s"
 
-#: src/ft.c:454
+#: ../src/ft.c:474
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "�廬��� �廬 ��廣�廨� 廩� %s �-%s"
 
-#: src/ft.c:608
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "�廣�廨� 廩� 廡��廛 %s ��廩���"
 
-#: src/ft.c:611
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "��廩��� �廣�廨廬 �廡��廛"
 
-#: src/ft.c:995
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "����廬 �廬 �廣�廨廬 %s"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "�廣�廨廬 �廡��廛 �����"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ���� �廬 �廣�廨廬 %s"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ���� �廬 �廣�廨廬 �廡��廛"
 
-#: src/ft.c:1119
+#: ../src/ft.c:1146
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "�廣�廨廬 �廡��廛 �-%s ��廩��."
 
-#: src/ft.c:1121
+#: ../src/ft.c:1148
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "�廣�廨廬 �廡��廛 �-%s ��廩��."
 
-#: src/gtkaccount.c:362
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1634,393 +2127,377 @@
 "<b>���� �廬����:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "��廚���� ���廖� ��廣廨�廬"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
 msgstr "廚廨���廡��:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "廩� �廬廢���:"
-
-#: src/gtkaccount.c:825
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "廖�廖��:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4538 ../src/gtkblist.c:4904
 msgid "Alias:"
 msgstr "廬���廨:"
 
-#: src/gtkaccount.c:834
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "���廨 廖�廖��"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "�廚廩廨���廬 ��廩廬�廩"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "���廣� 廣� ���廨 ��廩"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "廖�� ��廩 �廡廩廨:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr " %s �廚廩廨���廬"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "�廩廬�廩 ����廨�廬 �����廬"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "��� �廬���"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "�廩廬�廩 ����廨�廬 �廖����"
 
-#: src/gtkaccount.c:1249
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "��廬� �廨��廬 廚廨廚廨�� ��������"
 
-#: src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "�� 廬��� ��廩 �廡廨��"
 
-#: src/gtkaccount.c:1269
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "�廚廩廨���廬 �廬���"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "廖�� �_�廬���"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "_��廨�:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_�廢���:"
 
-#: src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
 msgstr "_廩� �廩廬�廩:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "廖�_廖��"
 
-#: src/gtkaccount.c:1700
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "��廖廚廬 �廩���"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1738
 msgid "Modify Account"
 msgstr "廣廨��廬 ��廩���"
 
+#: ../src/gtkaccount.c:1760
+msgid "_Basic"
+msgstr "_�廖�廖�"
+
+#: ../src/gtkaccount.c:1771
+msgid "_Advanced"
+msgstr "_�廬廡��"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:822
 msgid "Register"
 msgstr "�廨廩�"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "��� �廬� ���� 廩�廨廢��� ����廡 �廬 %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "��廡"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5187
 msgid "Screen Name"
 msgstr "廩� �廬廢���"
 
-#: src/gtkaccount.c:2210
-msgid "Enabled"
-msgstr "���廡"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
 msgstr "廚廨���廡��"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s �廚� %s ���廨 廩��/廩�� %s%s%s"
-
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"���廖�� �廨廩��廬 ��廩� �廡廩廨 廩��?"
-
-#: src/gtkaccount.c:2572
+#: ../src/gtkaccount.c:2586
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s �廚� %s ���廨 廩��/廩�� %s%s"
+
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "���廖�廝 �廬 ��廩 �廡廩廨 �廨廩��� 廩��?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4959 ../src/gtkconv.c:1616
+#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/protocols/sametime/sametime.c:5409 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "��廖廝"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:678
 msgid "Join a Chat"
 msgstr "�廢�廨廝 �廩���"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:699
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "�廩 ����� �廬 ����廣 ��廬��� 廣� �廢'�� 廩�廨廢��� ��廢�廨廝 ����.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:710 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "�廩_���:"
 
-#: src/gtkblist.c:935
+#: ../src/gtkblist.c:954
 msgid "Get _Info"
 msgstr "�廢� _廚廨���"
 
-#: src/gtkblist.c:938
+#: ../src/gtkblist.c:957 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "���廣�"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:963
 msgid "_Send File"
 msgstr "廩�� 廡��廛"
 
-#: src/gtkblist.c:950
+#: ../src/gtkblist.c:971
+msgid "Start _Voice Chat"
+msgstr "���� 廩��� _廡���廬"
+
+#: ../src/gtkblist.c:977
 msgid "Add Buddy _Pounce"
 msgstr "���廖�_廝 廬���� �廚廣��廬 ��廩 廡廩廨?"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:981 ../src/gtkblist.c:985 ../src/gtkblist.c:1084
+#: ../src/gtkblist.c:1107
 msgid "View _Log"
 msgstr "�廢_� 廨�廩��"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "廩� ��廖廝 ���廩 �廡廩廨..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "�廖廨 ��廩 廡廩廨"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "廩� ��廖廝 ���廩 �廡廩廨..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "�廖廨 ��廩 廡廩廨"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: ../src/gtkblist.c:996
+msgid "Alias..."
+msgstr "廩� ��廖廝..."
+
+#: ../src/gtkblist.c:999 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
+msgid "Remove"
+msgstr "�廖廨"
+
+#: ../src/gtkblist.c:1005 ../src/gtkblist.c:1092 ../src/gtkblist.c:1113
 msgid "_Alias..."
 msgstr "_廩� ��廖廝..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:1007 ../src/gtkblist.c:1094 ../src/gtkblist.c:1115
 msgid "_Remove"
 msgstr "_�廖廨"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1055
 msgid "Add a _Buddy"
 msgstr "��廖廚廬 _��廩 廡廩廨"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1057
 msgid "Add a C_hat"
 msgstr "��廖廝 _廩���"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1060
 msgid "_Delete Group"
 msgstr "�廖廨 _廡��廢�"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1062
 msgid "_Rename"
 msgstr "_廩�� 廩�"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1080 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "�廢_�廨廝"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1082
 msgid "Auto-Join"
 msgstr "�廢�廨廝 �������廬"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1120 ../src/gtkblist.c:1143
 msgid "_Collapse"
 msgstr "_廡廚�"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1148
 msgid "_Expand"
 msgstr "�_廨��"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
+#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1438 ../src/gtkblist.c:3753
+#: ../src/gtkblist.c:3763
 msgid "/Tools/Mute Sounds"
 msgstr "/����/�廩廬廡 廢�����"
 
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4203 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "���� ����廨/廬 �廨�廣 廣� ��廩��� 廩�廖��� ���廖�廝 ��廩 廡廩廨 ��."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: ../src/gtkblist.c:2475
 msgid "/_Buddies"
 msgstr "/_��廩� 廡廩廨"
 
-#: src/gtkblist.c:2330
+#: ../src/gtkblist.c:2476
 msgid "/Buddies/New Instant _Message..."
 msgstr "/��廩� 廡廩廨/��_�廣� ��廩�..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2477
 msgid "/Buddies/Join a _Chat..."
 msgstr "/��廩� 廡廩廨/�廢�廨廝 �_廩���..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2478
 msgid "/Buddies/Get User _Info..."
 msgstr "/��廩� 廡廩廨/�廢� _廚廨�� �廩廬�廩..."
 
-#: src/gtkblist.c:2333
+#: ../src/gtkblist.c:2479
 msgid "/Buddies/View User _Log..."
 msgstr "/��廩� 廡廩廨/�廢� ���_� 廩���廬 廣� �廩廬�廩..."
 
-#: src/gtkblist.c:2335
+#: ../src/gtkblist.c:2481
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/��廩� 廡廩廨/�廢� ��廩� 廡廩廨 廩_���� ����廨��"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2482
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/��廩� 廡廩廨/�廢� _廡��廢�廬 廨�廡�廬"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: ../src/gtkblist.c:2483
 msgid "/Buddies/Show Buddy _Details"
-msgstr "�廢� �� _�廩廬�廩�� ���廬廡�� �廨廩���"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "�廢� �� _�廩廬�廩�� ���廬廡�� �廨廩���"
-
-#: src/gtkblist.c:2340
+msgstr "/��廩� 廡廩廨/�廢� 廚廨_�� ��廩�-廡廩廨"
+
+#: ../src/gtkblist.c:2484
+msgid "/Buddies/Show Idle _Times"
+msgstr "/��廩� 廡廩廨/�廢� _���� ��廖廨-廚廣���廬"
+
+#: ../src/gtkblist.c:2485
+msgid "/Buddies/_Sort Buddies"
+msgstr "/��廩� 廡廩廨/_���� ��廩�-廡廩廨"
+
+#: ../src/gtkblist.c:2487
 msgid "/Buddies/_Add Buddy..."
 msgstr "/��廩� 廡廩廨/_��廖廝 ��廩 廡廩廨..."
 
-#: src/gtkblist.c:2341
+#: ../src/gtkblist.c:2488
 msgid "/Buddies/Add C_hat..."
 msgstr "/��廩� 廡廩廨/��廖廝 廢'��..."
 
-#: src/gtkblist.c:2342
+#: ../src/gtkblist.c:2489
 msgid "/Buddies/Add _Group..."
 msgstr "/��廩� 廡廩廨/ ��廖廝 廡��廢� ��廩�..."
 
-#: src/gtkblist.c:2344
+#: ../src/gtkblist.c:2491
 msgid "/Buddies/_Quit"
 msgstr "/��廩� 廡廩廨/_�廢���"
 
+#. Accounts menu
+#: ../src/gtkblist.c:2494
+msgid "/_Accounts"
+msgstr "/_�廩����廬"
+
+#: ../src/gtkblist.c:2495 ../src/gtkblist.c:5538
+msgid "/Accounts/Add\\/Edit"
+msgstr "/_�廩����廬/��廖廝/\\廣廨��"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2498
 msgid "/_Tools"
 msgstr "/_����"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: ../src/gtkblist.c:2499
+msgid "/Tools/Buddy _Pounces"
 msgstr "/����/廬_����廬 廚廣���廬 ��廩� 廡廩廨"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/����/廚廣���廬 �廩��_�"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/����/_�廩����廬"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2500
+msgid "/Tools/Plu_gins"
+msgstr "/����/廬�_廖廚��"
+
+#: ../src/gtkblist.c:2501
 msgid "/Tools/Pr_eferences"
 msgstr "/����/_�廣�廚�廬"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/����/廚廣���廬 廬�廖廚��"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2502
 msgid "/Tools/Pr_ivacy"
 msgstr "/����/_廚廨���廬"
 
-#: src/gtkblist.c:2355
+#: ../src/gtkblist.c:2504
 msgid "/Tools/_File Transfers"
 msgstr "/����/�廣�廨廬 _廡�廢��..."
 
-#: src/gtkblist.c:2356
+#: ../src/gtkblist.c:2505
 msgid "/Tools/R_oom List"
 msgstr "/����/_廨廩��廬 ������廬"
 
-#: src/gtkblist.c:2358
+#: ../src/gtkblist.c:2506
+msgid "/Tools/System _Log"
+msgstr "/����/��\"� ��廣廨�廬"
+
+#: ../src/gtkblist.c:2508
 msgid "/Tools/Mute _Sounds"
 msgstr "/����/�_廩廬廡 廢�����"
 
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/����/�廢� �廬 廡��廛 ��\"� ��廣廨�廬"
-
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2511
 msgid "/_Help"
 msgstr "/_廣�廨�"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2512
 msgid "/Help/Online _Help"
 msgstr "/廣�廨�/廣�廨� �廡���廬"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2513
 msgid "/Help/_Debug Window"
 msgstr "/廣�廨�/_���� ��廚�� �����"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2514
 msgid "/Help/_About"
 msgstr "/廣�廨�/_����廬"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2546 ../src/gtkblist.c:2615
 #, c-format
 msgid ""
 "\n"
@@ -2029,25 +2506,16 @@
 "\n"
 "<b>�廩���:</b> %s"
 
-#: src/gtkblist.c:2473
+#: ../src/gtkblist.c:2627
 #, c-format
 msgid ""
 "\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>廩� ��廖廝 ���廩 �廡廩廨:</b> %s"
-
-#: src/gtkblist.c:2481
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
 msgstr ""
 "\n"
 "<b>廩� ��廖廝:</b> %s"
 
-#: src/gtkblist.c:2489
+#: ../src/gtkblist.c:2639
 #, c-format
 msgid ""
 "\n"
@@ -2056,7 +2524,7 @@
 "\n"
 "<b>�����:</b> %s"
 
-#: src/gtkblist.c:2498
+#: ../src/gtkblist.c:2648
 #, c-format
 msgid ""
 "\n"
@@ -2065,7 +2533,7 @@
 "\n"
 "<b>����廨:</b> %s"
 
-#: src/gtkblist.c:2510
+#: ../src/gtkblist.c:2659
 #, c-format
 msgid ""
 "\n"
@@ -2074,7 +2542,7 @@
 "\n"
 "<b>�� 廚廣��:</b> %s"
 
-#: src/gtkblist.c:2546
+#: ../src/gtkblist.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -2083,7 +2551,7 @@
 "\n"
 "<b>�廨�� ���廨���:</b> �廚�� %s"
 
-#: src/gtkblist.c:2554
+#: ../src/gtkblist.c:2703
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2091,7 +2559,7 @@
 "\n"
 "<b>�廢�:</b> ���廬廡"
 
-#: src/gtkblist.c:2577
+#: ../src/gtkblist.c:2714
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2099,7 +2567,7 @@
 "\n"
 "<b>廬���廨:</b> �廚���"
 
-#: src/gtkblist.c:2579
+#: ../src/gtkblist.c:2716
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2107,7 +2575,7 @@
 "\n"
 "<b>�廢�:</b> �����"
 
-#: src/gtkblist.c:2581
+#: ../src/gtkblist.c:2718
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2115,105 +2583,118 @@
 "\n"
 "<b>�廢�:</b> �廡廚�廛"
 
-#: src/gtkblist.c:2843
-#, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "�� 廚廣�� )%d廩%02d�( "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "�� 廚廣�� )%d �廡�廬( "
-
-#: src/gtkblist.c:2848
-msgid "Idle "
-msgstr "��廖廨 廚廣���廬 "
-
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "�� �廡��� "
-
-#: src/gtkblist.c:2968
+#: ../src/gtkblist.c:3007
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "�� 廚廣�� %d廩 %02d�"
+
+#: ../src/gtkblist.c:3009
+#, c-format
+msgid "Idle %dm"
+msgstr "�� 廚廣�� %d �廡�廬"
+
+#. Idle stuff
+#: ../src/gtkblist.c:3012 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5208 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
+msgstr "��廖廨 廚廣���廬"
+
+#: ../src/gtkblist.c:3144
 msgid "/Buddies/New Instant Message..."
 msgstr "/��廩� 廡廩廨/��_�廣� ��廩�..."
 
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+#: ../src/gtkblist.c:3145 ../src/gtkblist.c:3178
 msgid "/Buddies/Join a Chat..."
 msgstr "/��廩� 廡廩廨/�廢�廨廝 �_廩���..."
 
-#: src/gtkblist.c:2970
+#: ../src/gtkblist.c:3146
 msgid "/Buddies/Get User Info..."
 msgstr "/��廩� 廡廩廨/�廢� _廚廨�� �廩廬�廩..."
 
-#: src/gtkblist.c:2971
+#: ../src/gtkblist.c:3147
 msgid "/Buddies/Add Buddy..."
 msgstr "/��廩� 廡廩廨/_��廖廝 ��廩 廡廩廨..."
 
-#: src/gtkblist.c:2972
+#: ../src/gtkblist.c:3148 ../src/gtkblist.c:3181
 msgid "/Buddies/Add Chat..."
 msgstr "/��廩� 廡廩廨/��廖廝 廢'��..."
 
-#: src/gtkblist.c:2973
+#: ../src/gtkblist.c:3149
 msgid "/Buddies/Add Group..."
 msgstr "/��廩� 廡廩廨/ ��廖廝 廡��廢� ��廩�..."
 
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/����/_廨廩��廬 ��廨� �廢'��"
-
-#: src/gtkblist.c:3009
+#: ../src/gtkblist.c:3184
+msgid "/Tools/Buddy Pounces"
+msgstr "/����/廬����廬 �廚廣���廬 ��廩� 廡廩廨"
+
+#: ../src/gtkblist.c:3187
 msgid "/Tools/Privacy"
 msgstr "/����/_廚廨���廬"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: ../src/gtkblist.c:3190
+msgid "/Tools/Room List"
+msgstr "/����/_廨廩��廬 ��廨� �廢'��"
+
+#: ../src/gtkblist.c:3384
 msgid "Manually"
-msgstr "��廬�� ��廩�廬"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "����廬"
+
+#: ../src/gtkblist.c:3386
 msgid "Alphabetically"
 msgstr "��廚�廬�廬"
 
-#: src/gtkblist.c:3088
+#: ../src/gtkblist.c:3387
 msgid "By status"
 msgstr "�廚� �廢�"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3388
 msgid "By log size"
 msgstr "�廚� ���� ���� �廩���廬"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/����/廬����廬 �廚廣���廬 ��廩� 廡廩廨"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/����/廚廣���廬 �廩��_�"
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191
+#, c-format
+msgid "%s disconnected"
+msgstr "%s ���廬廡"
+
+#: ../src/gtkblist.c:3515
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s ��廬廡: %s</span>"
+
+#: ../src/gtkblist.c:3642
+msgid "/Accounts"
+msgstr "/�廩����廬"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3747
 msgid "/Buddies/Show Offline Buddies"
 msgstr "�廢� �� _�廩廬�廩�� ���廬廡�� �廨廩���"
 
-#: src/gtkblist.c:3324
+#: ../src/gtkblist.c:3750
 msgid "/Buddies/Show Empty Groups"
 msgstr "/��廩� 廡廩廨/�廢� 廡��廢�廬 廨�廡�廬"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: ../src/gtkblist.c:3756
 msgid "/Buddies/Show Buddy Details"
-msgstr "�廢� �� _�廩廬�廩�� ���廬廡�� �廨廩���"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/��廩� 廡廩廨/�廢� 廚廨�� ��廩�-廡廩廨"
+
+#: ../src/gtkblist.c:3759
+msgid "/Buddies/Show Idle Times"
+msgstr "/��廩� 廡廩廨/�廢� ���� ��廖廨 廚廣���廬"
+
+
+#: ../src/gtkblist.c:4471 ../src/protocols/silc/buddy.c:736
+#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2976
 msgid "Add Buddy"
 msgstr "��廖廝 ��廩 廡廩廨"
 
-#: src/gtkblist.c:4029
+#: ../src/gtkblist.c:4495
 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. "
@@ -2222,75 +2703,165 @@
 "�廩 ����� �廬 廩� ��廩廬�廩 廩� ��廬� �廬� 廨�廢�� ���廖�廝 �廨廩��廬 �廡廩廨..�廩�� �� �廚廩廨�廬 "
 "�廬廬 ����� �廩廨 ��廢� ��廡�� 廩� ��廩廬�廩\n"
 
+#: ../src/gtkblist.c:4517
+msgid "Screen Name:"
+msgstr "廩� �廬廢���:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4565 ../src/gtkblist.c:4884
 msgid "Account:"
 msgstr "�廩���:"
 
-#: src/gtkblist.c:4357
+#: ../src/gtkblist.c:4817
 msgid "This protocol does not support chat rooms."
 msgstr "廚廨���廡�� �� ���� 廬��� ���廨� 廢'��"
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4833
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "���� ����廨/廬 �廚廨���廡�� ��廩�� ���廚廩廨 廩���廩 �廢'��."
 
-#: src/gtkblist.c:4390
+#: ../src/gtkblist.c:4850
 msgid "Add Chat"
 msgstr "��廖廝 廩���"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4874
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "�廩 ����� 廩� ��廖廝, ����廣 �廬��� 廣� �廢'�� 廩�廨廢��� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨 廩��.\n"
 
-#: src/gtkblist.c:4493
+#: ../src/gtkblist.c:4956 ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5407
 msgid "Add Group"
 msgstr "��廖廝 廡��廢�"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:4957
 msgid "Please enter the name of the group to be added."
 msgstr "�廩 ����� �廬 廩� �廡��廢� ���廩�."
 
-#: src/gtkblist.c:5025
+#: ../src/gtkblist.c:5578
+msgid "_Edit Account"
+msgstr "_廣廨�� �廩���"
+
+#: ../src/gtkblist.c:5611 ../src/gtkblist.c:5617
 msgid "No actions available"
 msgstr "�� ��廬� ��廢廣 廚廣���廬"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: ../src/gtkblist.c:5625
+msgid "_Disable"
+msgstr "_���"
+
+#: ../src/gtkblist.c:5637
+msgid "Enable Account"
+msgstr "�廚廣� �廩���"
+
+#: ../src/gtkblist.c:5690
 msgid "/Tools"
 msgstr "/_����"
 
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "���廬廡"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
+#: ../src/gtkblist.c:5785
+msgid "/Buddies/Sort Buddies"
+msgstr "/��廩� 廡廩廨/���� ��廩�-廡廩廨"
+
+#: ../src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "廩� 廢�廣 �廨廡廣"
+
+#: ../src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "廢�廣 �廨廡廣 ���廨��廬"
+
+#: ../src/gtkcellview.c:205 ../src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "廢�廣 �廨廡廣"
+
+#: ../src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "廢�廣 �廨廡廣 �廢�廣 GdkColor"
+
+#: ../src/gtkcellview.c:213
+msgid "Background set"
+msgstr "廡��廣廬 廨廡廣"
+
+#: ../src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "��� 廬��廬 �� �廩廚�廣� 廣� 廢�廣 �廨廡廣"
+
+#: ../src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr "���� �廬��� ��廩���廬"
+
+#: ../src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr "����� �廬��� ��廩���廬"
+
+#: ../src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr "廨��� �����"
+
+#: ../src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr "廨��� ����� ���廡�� �廚廨���� 廣� 廨廩廬"
+
+#: ../src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "廚廨�廖� 廣� �廖廚廨 廩�廨�廬"
+
+#: ../src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr "廣���廬 ����-�廣廛 ����� �廬 廣廨�� �廚廨�廖� 廣� �廩�廨�廬"
+
+#: ../src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr "廣���廬 �廚廨�廖� 廣� 廣����廬"
+
+#: ../src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr "廣���廬 ����-�廣廛 ����� �廬 廣廨�� �廚廨�廖� 廣� �廣����廬"
+
+#: ../src/gtkcombobox.c:529
+msgid "Active item"
+msgstr "廚廨�� 廚廣��"
+
+#: ../src/gtkcombobox.c:530
+msgid "The item which is currently active"
+msgstr "�廚廨�� �廚廣��"
+
+#: ../src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "�廨�� �廨廩���"
+
+#: ../src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr "��� 廬���廬-�廩����廬 廢廨���廬 ���廨��廬 ��� 廨廩���廬 ��� 廬廚廨����"
+
+#: ../src/gtkconn.c:192
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+"%s ��廬廡 廣廡� 廩����: %s\n"
+"���� �� ��廖� ���廨 �廬 ��廩��� ���廩 廣� �廩廨 ��廣�� 廬廬�廡�, ���廩��� ��廚廣� ���廩."
+
+#: ../src/gtkconv.c:364
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "��� �廩廬�廩 ����� ��廨廖� %s."
 
-#: src/gtkconv.c:334
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "�廚廩廨���廬 ��廚�� ������ ��廬���廬 ��:  version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "��� 廚廡��� ��� (��廡廩廨 ���)."
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2298,741 +2869,777 @@
 "�廬廩�廩 �-\"help &lt;廚廡���&gt;\" �廡��廬 廣�廨� 廣� 廚廡��� 廖廚廢�廚�廬.\n"
 "���� �廚廡���廬 廩�廚廩廨��� ��廡廩廨 ������:\n"
 
-#: src/gtkconv.c:446
+#: ../src/gtkconv.c:484
 msgid "No such command."
 msgstr "��� 廚廡��� ���."
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "廩���廬 廬���廨:  �廡��廬 �廖廚廨 廩��� 廩� �廨������� �廚廡��� ��."
 
-#: src/gtkconv.c:458
+#: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
 msgstr "�廚廡��� 廩�� ��廩�� �廖��� �� ���廣�."
 
-#: src/gtkconv.c:465
+#: ../src/gtkconv.c:503
 msgid "That command only works in chats, not IMs."
 msgstr "廚廡��� �� 廚�廣�廬 廨廡 �廬�� 廢'����, �� ����廣�廬."
 
-#: src/gtkconv.c:468
+#: ../src/gtkconv.c:506
 msgid "That command only works in IMs, not chats."
 msgstr "廚廡��� �� 廚�廣�廬 廨廡 ����廣�廬, �� �廬�� 廢'����."
 
-#: src/gtkconv.c:472
+#: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "廚廡��� �� �� 廚�廣�廬 �廚廡���廡�� ��."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
+#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "��廩 廡廩廨 �� ���� ���廬� 廚廨���廡�� 廩� 廢'�� ��"
 
-#: src/gtkconv.c:719
+#: ../src/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "���� ����廨/廬 ��廩��� 廩���� ������ �廬 ��廩 �廡廩廨 ���."
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "���� ��廩 廡廩廨 �廬�� ��廨 廢'��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ������, ��� 廣� ���廣廬 ����� ��廚廢�����廬."
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_��廩 �廡廩廨:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "�_��廣�:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "��� �廚廩廨�廬 �廚廬�� �廬 �廡��廛."
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>廩��� 廣� %s>/h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "廩��廨 廩���"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "�廚廩"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_�廚廩 �廣��廨: "
 
-#: src/gtkconv.c:1227
-#, fuzzy
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "廨�廩�� 廩��� ��, ��廩�."
-
-#: src/gtkconv.c:1235
-#, fuzzy
+msgstr "廨�廩�� ����. ���廣�廬 �廩��� �� ��廨廩�� �廣廬�."
+
+#: ../src/gtkconv.c:1298
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "廨�廩�� 廩��� ��, ��廩�."
-
-#: src/gtkconv.c:1489
+msgstr "廨�廩�� ��廚廖廡. ���廣�廬 �廩��� �� �� ��廨廩�� �廣廬�."
+
+#: ../src/gtkconv.c:1578
 msgid "IM"
 msgstr "���廣�"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650
 msgid "Send File"
 msgstr "廩�� 廡��廛"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1591
 msgid "Un-Ignore"
 msgstr "��� �� �廬廣���廬"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1594
 msgid "Ignore"
 msgstr "�廬廣��"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1600
 msgid "Info"
 msgstr "���廣"
 
-#: src/gtkconv.c:1517
+#: ../src/gtkconv.c:1606
 msgid "Get Away Message"
 msgstr "�廩� �廬 ���廣廬 ��廬廨�廡�廬"
 
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "�廖廨"
-
-#: src/gtkconv.c:2236
+#: ../src/gtkconv.c:1621
+msgid "Last said"
+msgstr "���廨 ���廨���"
+
+#: ../src/gtkconv.c:2407
 msgid "Unable to save icon file to disk."
 msgstr "�� ��廬� �廩��廨 �廬 �廖�� ���廖廡."
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "廩��廨廬 廖��"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2479
 msgid "Animate"
 msgstr "��廚廩"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "�廖廬廨 廖��"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "廩��廨廬 廖�� �廩�..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2631
 msgid "/_Conversation"
 msgstr "/_廩���"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/New Instant _Message..."
 msgstr "/廩���/���_廣� ��廩�..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2638
 msgid "/Conversation/_Find..."
 msgstr "/廩���/_�廚廩..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/View _Log"
 msgstr "/廩���/�_廢� ���� 廩���廬"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Save As..."
 msgstr "/廩���/_廩��廨 �廩�..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/廩���/�_廡�"
-
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2643
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/廩���/�_廡� ����� ����廨"
+
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/Se_nd File..."
 msgstr "/廩���/廩_�� 廡��廛..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2648
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/廩���/��廖廝 廚_廣��廬 廬����..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2650
 msgid "/Conversation/_Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2652
 msgid "/Conversation/In_vite..."
 msgstr "/廩���/��_��..."
 
-#: src/gtkconv.c:2393
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/廩���/�_����..."
 
-#: src/gtkconv.c:2395
+#: ../src/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/廩���/�廖�_�..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/廩���/��廖_廝"
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/廩���/�廖_廨..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/廩���/���廖 廡�廩_�廨..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/廩���/���廖 廬_����..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/廩���/_廖��廨"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/_�廚廩廨���廬"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 _廢�����"
 
-#: src/gtkconv.c:2418
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
-
-#: src/gtkconv.c:2419
-msgid "/Options/Show Ti_mestamps"
-msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
-
-#: src/gtkconv.c:2420
+#: ../src/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/�廚廩廨���廬/�廢_� 廖�� 廩� ��廩 �廡廩廨"
 
-#: src/gtkconv.c:2460
+#: ../src/gtkconv.c:2684
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
+
+#: ../src/gtkconv.c:2685
+msgid "/Options/Show Ti_mestamps"
+msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
+
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/View Log"
 msgstr "廩���/�廢� ���� 廩���廬/"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2783
 msgid "/Conversation/Send File..."
 msgstr "廩���/廩�� 廡��廛.../"
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "廩���/��廖廝 廚廣��廬 廬���� ���廨�廣� ��廩 廡廩廨.../"
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Invite..."
 msgstr "/廩���/����..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Alias..."
 msgstr "/廩���/�����..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Block..."
 msgstr "/廩���/�廖��..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add..."
 msgstr "/廩���/��廖廝..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Remove..."
 msgstr "/廩���/�廖廨..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Insert Link..."
 msgstr "/廩���/���廖 廡_�廩�廨..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2825
 msgid "/Conversation/Insert Image..."
 msgstr "/廩���/���廖 廬����..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2831
 msgid "/Options/Enable Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2834
 msgid "/Options/Enable Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 廢�����"
 
-#: src/gtkconv.c:2520
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
 
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2850
 msgid "/Options/Show Timestamps"
 msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
 
-#: src/gtkconv.c:2526
+#: ../src/gtkconv.c:2853
 msgid "/Options/Show Buddy Icon"
 msgstr "/�廚廩廨���廬/�廢_� 廖�� 廩� ��廩 �廡廩廨"
 
-#: src/gtkconv.c:2597
+#: ../src/gtkconv.c:2933
 msgid "User is typing..."
 msgstr "��廩廬�廩 ��廬� �廨�廣..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
-msgstr "��廩廬�廩 �廬� �廩�� ��廚廖�廡"
-
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#: ../src/gtkconv.c:2936
+msgid "User has typed something and stopped"
+msgstr "��廩廬�廩 �廬� �廩�� �廣廢廨"
+
+#. Build the Send To menu
+#: ../src/gtkconv.c:3119
 msgid "_Send To"
-msgstr "廩�� �廬�廨"
-
-#: src/gtkconv.c:3373
+msgstr "廩�� _��"
+
+#: ../src/gtkconv.c:3771
+msgid "_Send"
+msgstr "廩_��"
+
+#: ../src/gtkconv.c:3824 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "��廬廨廬:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "0 ��廩�� ���廨 ��"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "廩�� ���廣� �����廬 ��廩廬�廩 ��"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "�廬廣�� ���廩廬�廩"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "�廢� ���廣 廣� ��廩廬�廩"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4942 ../src/gtkconv.c:5051
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��廩 %d ���廨 ��"
 msgstr[1] "%d ��廩�� ���廨 ��"
 
-#: src/gtkconv.c:5582
+#: ../src/gtkconv.c:6521
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  廩�� ���廣� �廨���, ����� �� �廨� 廚廡���."
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6524
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  廩�� ��廩廬�廩 �� 廢'�� 廚廣��� ��廖� IRC."
 
-#: src/gtkconv.c:5588
+#: ../src/gtkconv.c:6527
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  廩�� �� ���� 廨廖�廖� ���廣 ����� 廩��� ������."
 
-#: src/gtkconv.c:5591
+#: ../src/gtkconv.c:6530
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: �廡� �廬 廬��� ���� �廩���."
 
-#: src/gtkconv.c:5594
+#: ../src/gtkconv.c:6533
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  廣�廨� 廣� 廚廡��� 廖廚廢�廚�廬."
 
-#: src/gtkconv.c:5709
+#: ../src/gtkconv.c:6692
 msgid "Confirm close"
 msgstr "�廩廨 廖��廨�"
 
-#: src/gtkconv.c:5741
+#: ../src/gtkconv.c:6724
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "�廩 �� ���廣�廬 廩�� �廡廨��. ��� �廨廢��� �廖��廨 �廬 �����?"
 
-#: src/gtkconv.c:6408
+#: ../src/gtkconv.c:7528
 msgid "Close conversation"
 msgstr "廖��廨 ����"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:7992
 msgid "Last created window"
 msgstr "���� ��廨�� 廩��廢廨"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:7994
 msgid "Separate IM and Chat windows"
 msgstr "�廚廨� ��� �����廬 廩� ���廣�廬 �廢'����"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:7996 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "���� ��廩"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:7998
 msgid "By group"
 msgstr "�廚� 廡��廢�廬"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:8000
 msgid "By account"
 msgstr "�廚� �廩���"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "廩��廨 廨�廩��廬 ��廚�� �����"
 
-#: src/gtkdebug.c:586
+#: ../src/gtkdebug.c:586
 msgid "Invert"
 msgstr "�廚��"
 
-#: src/gtkdebug.c:589
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr "廖�� 廬�廢��廬"
 
-#: src/gtkdebug.c:636
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "���� ��廚�� �����"
 
-#: src/gtkdebug.c:689
+#: ../src/gtkdebug.c:689
 msgid "Clear"
 msgstr "�廡�"
 
-#: src/gtkdebug.c:698
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "�廩����"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "�廬��廬 ���"
 
-#: src/gtkdebug.c:724
+#: ../src/gtkdebug.c:724
 msgid "Filter"
 msgstr "�廚�"
 
-#: src/gtkdebug.c:743
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
 msgstr "���廢� ����廬 �廣�� �廚廩廨���廬."
 
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "�廚廬� 廨�廩�"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74
 msgid "developer"
 msgstr "�廚廬�"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:64
+msgid "win32 port"
+msgstr "��廨廖� ������廬"
+
+#: ../src/gtkdialogs.c:66
 msgid "developer & webmaster"
 msgstr "�廚廬� ����� �廬廨"
 
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "��廨廖� ������廬"
-
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "廬����"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "�廬��廡"
 
-#: src/gtkdialogs.c:89
+#: ../src/gtkdialogs.c:96
 msgid "libfaim maintainer"
 msgstr "�廬��廡 libfaim"
 
-#: src/gtkdialogs.c:92
+#: ../src/gtkdialogs.c:97
+msgid "hacker and designated driver [lazy bum]"
+msgstr "�廬��廬 ���� 廚��� - 廣廢��"
+
+#: ../src/gtkdialogs.c:98
 msgid "Jabber developer"
 msgstr "�廚廬� Jabber"
 
-#: src/gtkdialogs.c:93
+#: ../src/gtkdialogs.c:99
 msgid "original author"
 msgstr "�廬��廬 �廡�廨�"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "�廬��廬 ���� 廚��� - 廣廢��"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
 msgid "Bulgarian"
 msgstr "����廨�廬"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr "������廬"
+
+#: ../src/gtkdialogs.c:110
 msgid "Bosnian"
-msgstr "�廖����廬"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "��廖��廬"
+
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
 msgid "Catalan"
 msgstr "廡����廬"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161
 msgid "Czech"
 msgstr "廢'��廬"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:113
 msgid "Danish"
 msgstr "���廬"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162
 msgid "German"
 msgstr "�廨���廬"
 
-#: src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+msgid "Greek"
+msgstr "�����廬"
+
+#: ../src/gtkdialogs.c:117
 msgid "Australian English"
 msgstr "�����廬 �廨���廬"
 
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "�����廬 �廨���廬"
-
-#: src/gtkdialogs.c:108
+#: ../src/gtkdialogs.c:118
 msgid "Canadian English"
 msgstr "�����廬 廡���廬"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:119
+msgid "British English"
+msgstr "�����廬 �廨���廬"
+
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Spanish"
 msgstr "廖廚廨��廬"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Finnish"
 msgstr "廚���廬"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "French"
 msgstr "廢廨廚廬�廬"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:123
 msgid "Hebrew"
 msgstr "廣�廨�廬"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:124
 msgid "Hindi"
 msgstr "�����廬"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:125
 msgid "Hungarian"
 msgstr "����廨�廬"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173
 msgid "Italian"
 msgstr "����廡�廬"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Japanese"
 msgstr "�廚��廬"
 
-#: src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177
+msgid "Georgian"
+msgstr "�廨���廬"
+
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178
+msgid "Korean"
+msgstr "廡�廨����廬"
+
+#: ../src/gtkdialogs.c:130
+msgid "Kurdish"
+msgstr "��廨��廬"
+
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
 msgid "Lithuanian"
 msgstr "�������廬"
 
-#: src/gtkdialogs.c:118
-msgid "Georgian"
-msgstr "�廨���廬"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
-msgid "Korean"
-msgstr "廡�廨����廬"
-
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:132
+msgid "Macedonian"
+msgstr "�廡����廬"
+
+#: ../src/gtkdialogs.c:133
 msgid "Dutch, Flemish"
 msgstr "������廬, 廚���廬"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "�廡����廬"
-
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:134
 msgid "Norwegian"
 msgstr "��廨���廬"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
 msgid "Polish"
 msgstr "廚����廬"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:137
 msgid "Portuguese"
 msgstr "廚�廨�����廬"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:138
 msgid "Portuguese-Brazil"
 msgstr "廚�廨�����廬 �廨�����廬"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:139
 msgid "Romanian"
 msgstr "廨����廬"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Russian"
 msgstr "廨�廖�廬"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142
 msgid "Serbian"
 msgstr "廖廨��廬"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:143
 msgid "Slovenian"
 msgstr "廖���廡�廬"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184
 msgid "Swedish"
 msgstr "廩����廬"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:145
+msgid "Tamil"
+msgstr "廬���"
+
+#: ../src/gtkdialogs.c:146
 msgid "Telugu"
-msgstr "����� )����("
-
-#: src/gtkdialogs.c:134
+msgstr "�����"
+
+#: ../src/gtkdialogs.c:147
+msgid "Turkish"
+msgstr "廬�廨��廬"
+
+#: ../src/gtkdialogs.c:148
 msgid "Vietnamese"
 msgstr "�������廬"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:148
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "廢��廬 VI 廩� ����"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185
 msgid "Simplified Chinese"
 msgstr "廖���廬 廚廩���"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
 msgid "Traditional Chinese"
 msgstr "廖���廬 �廖�廨廬�廬"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:157
 msgid "Amharic"
 msgstr "���廨�廬"
 
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:183
 msgid "Slovak"
 msgstr "廖���廡�廬"
 
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:227
 msgid "About Gaim"
 msgstr "����廬 Gaim"
 
-#: src/gtkdialogs.c:226
+#: ../src/gtkdialogs.c:251
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"���� ���� 廬���廬 廢'�� �廩���廬 ���廣�廬 �����廨�廬 �廬���廬 �廩���廩 �AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zepher,�-Gadu-Gadu �廣廬 "
-"��廣��� ��廬.��� ��廬�� 廬�� 廩���廩 �-Gtk+ �廬�廬 ������ �廩���廩 廩� �-GNU GPL."
-">BR><BR>"
-
-#: src/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr ""
+"���� ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �����廨�廬 ���廚廩廨廬 廩���廩 � "
+"AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novel GroupWise, Lotus Sametime, "
+"Napster, Zephyr, Gadu-Gadu "
+"������ ��-����廬. �廬���� ��廬�� �廣�廨廬 GTK+.<BR><BR> "
+"��廬廨 �� �廣廨�� 廩������ ���廚�廛 �廬 �廬���� 廬�廬 �����廬 廨�廩��� �-GPL "
+"(��廨廖� 2 �� ����廨 ��廬廨). "
+"�廣廬廡 廩� �-GPL ���� �廬�� �廡��廛 'COPYING' ���廚廛 廣� ����. ���� ��� 廬�廬 �����廬 "
+"��廚廬��� ��廬�廨��� �廚�廬��. 廨�� �廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� �廬�廨���. "
+"����� �廖廚廡�� 廩�� ��廨��廬 �廬���� ��.<BR><BR>"
+
+#: ../src/gtkdialogs.c:265
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim �- irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim �- irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "�廚廬��� 廚廣����"
-
-#: src/gtkdialogs.c:259
+#: ../src/gtkdialogs.c:274
+msgid "Current Developers"
+msgstr "�廚廬���"
+
+#: ../src/gtkdialogs.c:289
 msgid "Crazy Patch Writers"
 msgstr "���廨� 廬�廡���� ���廨廚��"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:304
 msgid "Retired Developers"
 msgstr "�廚廬��� 廩廬廨�� �廣�廨"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:319
 msgid "Current Translators"
 msgstr "�廬廨���� 廚廣����"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:339
 msgid "Past Translators"
 msgstr "�廬廨���� �廩廣�廨"
 
-#: src/gtkdialogs.c:327
+#: ../src/gtkdialogs.c:357
 msgid "Debugging Information"
 msgstr "���廣 ���廚�� �����"
 
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
+#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
 msgid "_Name"
 msgstr "廩�_"
 
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
 msgid "_Account"
 msgstr " �廩���"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:566
 msgid "New Instant Message"
 msgstr "���廣� ����廬 ��廩�"
 
-#: src/gtkdialogs.c:504
+#: ../src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "�� ��� �廬 廩� ���廣� ���� �廨廢��� �廩��� ���廣�."
 
-#: src/gtkdialogs.c:643
+#: ../src/gtkdialogs.c:703
 msgid "Get User Info"
 msgstr "���廣 ���� 廣� ��廩廬�廩"
 
-#: src/gtkdialogs.c:645
+#: ../src/gtkdialogs.c:705
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 �� ������ 廩� ���� 廩�廨廢���� �廡廨�� �廬 廚廨���."
 
-#: src/gtkdialogs.c:699
+#: ../src/gtkdialogs.c:771
 msgid "View User Log"
 msgstr "�廢� ���� 廩���廬 廣� ��廩廬�廩"
 
-#: src/gtkdialogs.c:701
+#: ../src/gtkdialogs.c:773
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "�廩 ����� �廬 廩� ��廩廬�廩 �� ������ 廩� ���� 廩�廨廢���� �廡廨�� ���� �廩���廬 ��廬�."
 
-#: src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:792
 msgid "Alias Contact"
 msgstr "廩� ��廖廝 ���廩 廡廩廨"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:793
 msgid "Enter an alias for this contact."
 msgstr "��� 廩� ��廖廝 廣��廨 ��廩 廡廩廨 ��."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:795 ../src/gtkdialogs.c:817 ../src/gtkdialogs.c:837
+#: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "廩� ��廖廝"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:813
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ".%s ��� ����� ��廩 廣��廨"
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:815
 msgid "Alias Buddy"
 msgstr "廩� ��廖廝 ���廩 �廡廩廨"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:834
 msgid "Alias Chat"
 msgstr "廩� ��廖廝 �廩���"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:835
 msgid "Enter an alias for this chat."
 msgstr "��� 廩� ��廖廝 �廩��� ��."
 
-#: src/gtkdialogs.c:800
+#: ../src/gtkdialogs.c:872
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3047,196 +3654,218 @@
 "��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩� 廡廩廨 ��廨�� "
 "�廬��� �廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: src/gtkdialogs.c:867
+#: ../src/gtkdialogs.c:880
+msgid "Remove Contact"
+msgstr "�廖廨 ��廩 廡廩廨"
+
+#: ../src/gtkdialogs.c:881
+msgid "_Remove Contact"
+msgstr "�_廖廨 ��廩 廡廩廨"
+
+#: ../src/gtkdialogs.c:932
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 �廡��廢� %s ��� ��廨�� �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:935
 msgid "Remove Group"
 msgstr "�廖廨 廡��廢�"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:936
+msgid "_Remove Group"
+msgstr "�廖廨 _廡��廢�"
+
+#: ../src/gtkdialogs.c:969
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:972
 msgid "Remove Buddy"
 msgstr "�廖廨 ��廩 廡廩廨"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:973
+msgid "_Remove Buddy"
+msgstr "�廖廨 ��廩 廡廩廨"
+
+#: ../src/gtkdialogs.c:994
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 �廢'�� %s �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "�廖廨 廩���"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:998
+msgid "_Remove Chat"
+msgstr "�廖_廨 廩���"
+
+#: ../src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f 廡\"�"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "��廩��"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "����"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "��廬�� ��廣�廨� ��廬���"
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>�廡�� �:</b>"
 
-#: src/gtkft.c:220
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�廡�� �:</b>"
 
-#: src/gtkft.c:224
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>廩��� ��:</b>"
 
-#: src/gtkft.c:226
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>廩��� �:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:443
 msgid "There is no application configured to open this type of file."
 msgstr "��� 廬���� ����廨廬 �廚廬��� 廡��廛 �廖�� ��."
 
-#: src/gtkft.c:447
+#: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
 msgstr "�廨廣� 廩���� �廣廬 廚廬��廬 �廡��廛."
 
-#: src/gtkft.c:467
+#: ../src/gtkft.c:485
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "廩���� ��廚廣�廬 �廚廡��� %s: %s"
 
-#: src/gtkft.c:476
+#: ../src/gtkft.c:494
 #, c-format
 msgid "Error running %s"
 msgstr "廩���� ��廨廢廬 %s"
 
-#: src/gtkft.c:477
+#: ../src/gtkft.c:495
 #, c-format
 msgid "Process returned error code %d"
 msgstr "廬���� ����廨 廡�� 廩���� %d"
 
-#: src/gtkft.c:572
+#: ../src/gtkft.c:589
 msgid "Progress"
 msgstr "�廬廡���廬"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:596
 msgid "Filename"
 msgstr "廩� �廡��廛"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:603
 msgid "Size"
 msgstr "����"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:610
 msgid "Remaining"
 msgstr "�廩�廨"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:641
 msgid "Filename:"
 msgstr "廩� �廡��廛:"
 
-#: src/gtkft.c:625
+#: ../src/gtkft.c:642
 msgid "Local File:"
 msgstr "廡��廛 �廡���:"
 
-#: src/gtkft.c:626
+#: ../src/gtkft.c:643
 msgid "Status:"
 msgstr "�廢�:"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:644
 msgid "Speed:"
 msgstr "���廨�廬:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:645
 msgid "Time Elapsed:"
 msgstr "���:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:646
 msgid "Time Remaining:"
 msgstr "��� 廩��廬廨:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "�廩�廨 �廬 ����� 廚廬��"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8546
+msgid "File Transfers"
+msgstr "�廩��� 廡�廢��"
+
+#: ../src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "廖��廨 ���� �� ���廨 廩�� ��廣�廨�廬 �廖廬����"
+
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_�廡� 廡�廢�� 廩��廣�廨�"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "�廖廬廨 廚廨�� �廣�廨�廬"
+msgstr "廚廨�� �廣�廨�廬 廡�廢��"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "�廩����"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "�_�廩�"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "��廩�"
 
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "���廡 �廬�廨 �廡廖�"
-
-#: src/gtkimhtml.c:1313
+#: ../src/gtkimhtml.c:818
+msgid "Paste as Plain _Text"
+msgstr "���廡 �廬�廨 _�廡廖� 廨���"
+
+#: ../src/gtkimhtml.c:1316
 msgid "Hyperlink color"
 msgstr "廢�廣 廡�廩�廨��"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1317
 msgid "Color to draw hyperlinks."
 msgstr "廢�廣 �廢��廣 �� 廡�廩�廨��."
 
-#: src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1320
 msgid "Hyperlink prelight color"
 msgstr "廢�廣 廡�廩�廨�� �廚�� ���廢�"
 
-#: src/gtkimhtml.c:1318
+#: ../src/gtkimhtml.c:1321
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "�廢�廣 �廢��廣 �� 廡�廩�廨�� ��廩廨 �廣��廨 �廣����."
 
-#: src/gtkimhtml.c:1537
+#: ../src/gtkimhtml.c:1542
 msgid "_Copy E-Mail Address"
 msgstr "�廣廬廡 _�廬��廬 ����\"�"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1554
 msgid "_Open Link in Browser"
 msgstr "_廚廬� �廬 �廡�廩�廨 ��廚�廚�"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1564
 msgid "_Copy Link Location"
 msgstr "�_廣廬廡 ��廡�� �廡�廩�廨"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3261
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3246,7 +3875,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: src/gtkimhtml.c:3237
+#: ../src/gtkimhtml.c:3264
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3256,7 +3885,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: src/gtkimhtml.c:3250
+#: ../src/gtkimhtml.c:3277
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3267,7 +3896,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: ../src/gtkimhtml.c:3280
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3278,183 +3907,177 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372
 msgid "Save Image"
 msgstr "廩��廨 廬����"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3400
 msgid "_Save Image..."
 msgstr "廩��廨 _廬����..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "���廨廬 ��廚�"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "���廨廬 廢�廣 �廡廖�"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "���廨廬 廢�廣 廨廡廣"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_廡�廩�廨"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_廬���廨"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "�廩 ����� �廬��廬 �廬���廨 廣��廨 �廡�廩�廨 �廨廢��� �����廖. �� ���� ����� 廬���廨."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�廩 ����� �廬 �廬��廬 �廡�廩�廨 廩�廨廢��� �����廖."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "��廖廚廬 廡�廩�廨"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "�_��廖"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "��廩��� �廣廬 廩��廨廬 �廬����: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "���廖 廬����"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "�廖� ������� �� ��� �������."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "����!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "����廩"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "����"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "廡� 廬�廬��"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "���� ���� ��廚�"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "�廡�� ���� ��廚�"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "廬���廨 ���廚�"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "廢�廣 ���廚�"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "廢�廣 �廨廡廣"
-
-#: src/gtkimhtmltoolbar.c:1023
+#: ../src/gtkimhtmltoolbar.c:1030
 msgid "Clear formatting"
 msgstr "�廡� 廚�廨��� �廡廖�"
 
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "���廖 廡�廩�廨"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "���廖 廬����"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "���廖 ����"
 
-#: src/gtklog.c:200
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "廩��� �-%s 廣� %s"
-
-#: src/gtklog.c:202
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "廩��� 廣� %s 廣� %s"
-
-#: src/gtklog.c:309
-#, fuzzy
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>�廩��� �廬�� %s �-%s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>廩��� 廣� %s �-%s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"��廨�廣� �廣廨�廬 廨廡 ��廨廩�� �� 廖��� <span style=\"italic\">�廚廣� �廣�廚廬 ���� "
-"��廣廨�廬</span>."
-
-#: src/gtklog.c:313
-#, fuzzy
+"��廨�廣� �廣廨�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �� 廩����� 廖���廖 ����� ��廣廨�廬\"."
+ 
+#: ../src/gtklog.c:315
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"���廣�廬 廨廡 ��廨廩�� �� 廖��� <span style=\"italic\">廨廩�� �廬 �� ����廣�廬</span>."
-
-#: src/gtklog.c:316
-#, fuzzy
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-"廢'���� 廨廡 ��廨廩�� �� 廖��� <span style=\"italic\">廨廩�� �廬 �� �廢'����</span>."
-
-#: src/gtklog.c:320
-#, fuzzy
+"���廣�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� ����廣�廬\"."
+
+#: ../src/gtklog.c:318
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"廢'���� 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� �廢'����\"."
+
+#: ../src/gtklog.c:322
 msgid "No logs were found"
-msgstr "�� ��廢�� ����� 廨�廩��."
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "�� ��廢�� ����� 廨�廩��"
+
+#: ../src/gtklog.c:398
 msgid "Total log size:"
-msgstr "�廚� ���� ���� �廩���廬"
-
-#: src/gtklog.c:472
+msgstr "���� ���� 廖�\"�:"
+
+#: ../src/gtklog.c:474
 #, c-format
 msgid "Conversations in %s"
 msgstr "廩���廬 �廬�� %s"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: ../src/gtklog.c:482 ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s 廩���廬 廣�"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:558
 msgid "System Log"
 msgstr "��\"� �廣廨�廬"
 
-#: src/gtkmain.c:326
+#: ../src/gtkmain.c:312
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "���� %s. �廩 ��廖�廬 '%s ��h' ����廣 ��廖廝.\n"
 
-#: src/gtkmain.c:328
-#, fuzzy, c-format
+#: ../src/gtkmain.c:314
+#, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
@@ -3470,7 +4093,6 @@
 "���� %s\n"
 "廩���廩: %s [�廚廩廨�廬]...\n"
 "\n"
-"  -a, --acct          �廢� ���� ���� ��廩����廬\n"
 "  -c, --config=廖廚廨��  �廩廬�廩 �廖廚廨��� �廡�廢� ���廨�廬\n"
 "  -d, --debug         廩�� ���廣�廬 ��廚�� ����� �-stdout\n"
 "  -h, --help          �廢� ���廣� �� �廢�\n"
@@ -3479,45 +4101,105 @@
 "                      ���� �� 廩� 廢廨�� ����廬 廚廖�廡)\n"
 "  -v, --version       �廢� �廬 ���廨廖�廩� �廬���� �廢�\n"
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "�廨�廨廬 ���� 廩� GNOME"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+#: ../src/gtkmain.c:497
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"���� �廚� ���廖� ��廬�� 廡��廛 廩� ����廨�� �廡��廛.\n"
+"��� ��� �����, 廩廡廨� ��� 廩�� �廩�� �廢���.\n"
+"\n"
+"�� ��廚廩廨�廬� ��廨�� ��廚��� �廡廨�廬 廩��, ��� ���廣 廣� �� ��廚廬�� ���� �廨�:\n"
+"%sbug.php\n"
+"\n"
+"�廩 �廚廨� ����廡 �� 廣廩�廬 ���� ��廚���, ��廩��� �廬 ���廣�廬 �-backtrace ��廡��廛 core.\n"
+"�� ���� ���廣/廬 ���廢�� �廬 �-backtrace, ��� 廡廨� �廬 ���廨��廬 �:\n"
+"%sgdb.php\n"
+"\n"
+"�� �廩 廢�廨� �廣�廨� ��廖廚廬, ��� 廚�� ����廣� �� SeanEgn �� LSchiere �廨� AIM.\n"
+"���廣 ��廢�廨 廡廩廨 廣� 廩�� ���廡 �廚廨���廡���� ��廨�� ��廢� �:\n"
+"%scontactinfo.php\n"
+
+
+#: ../src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "�廩��� �廖廬����."
+
+#: ../src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "�廬廡廩廨 �� %s"
+
+#: ../src/gtkmedia.c:73 ../src/gtkmedia.c:108
+msgid "End Call"
+msgstr "廖��� 廩���"
+
+#: ../src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "�廬廡��廬 廩��� ��廬 %s"
+
+#: ../src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "廖廨� �廩���"
+
+#: ../src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "廡�� 廩���"
+
+#: ../src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "����廨 �� %s"
+
+#: ../src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "�_廩廬廡"
+
+#: ../src/gtknotify.c:305
+msgid "New Mail"
+msgstr "���\"� ��廩"
+
+#: ../src/gtknotify.c:321
+msgid "Open All Messages"
+msgstr "廚廬� �廬 �� ����廣�廬"
+
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1115
+msgid "From"
+msgstr "��廬"
+
+#: ../src/gtknotify.c:390
+msgid "Subject"
+msgstr "�����"
+
+#: ../src/gtknotify.c:399
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">���廨 ��廩 ���廖!</span>"
+
+#: ../src/gtknotify.c:451
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "�廩 �-%s %d ���廣� ��廩�."
 msgstr[1] "�廩 �-%s %d ���廣�廬 ��廩�廬."
 
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">��廬:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">�����:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span size=\"larger\" weight=\"bold\">���廨 ��廩 ���廖!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+#: ../src/gtknotify.c:456
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3527,234 +4209,321 @@
 "<span size=\"larger\" weight=\"bold\">���廨 ��廩 ���廖!</span>\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5460
 msgid "Search Results"
 msgstr "廬�廢��廬 ��廚�廩"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "Info for %s"
 msgstr "���廣 廣��廨 %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "���廣 廣��廨 ��廩 �廡廩廨"
 
-#: src/gtknotify.c:687
+#: ../src/gtknotify.c:840
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "�廚廡��� <b>%s</b> ��廚�廚�, ���� 廬廡廚�."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
+#: ../src/gtknotify.c:992
 msgid "Unable to open URL"
 msgstr "URL�� ��廬� �廚廬�� �廬 �-"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "廩���� ��廚廣�廬 �廚廡��� <b>%s</b>: %s"
 
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:993
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "���廨� ���廢�廣 �廚廡��� '�����廬' 廩� ��廚�廚�, ��� �� �廡�廣� ��廨�� ���廢�廣."
 
-#: src/gtkpounce.c:130
+#: ../src/gtkplugin.c:275
+msgid "The following plugins will be unloaded."
+msgstr "�廬�廖廚�� 廩���� ��廚廨廡� �� ����廨��."
+
+#: ../src/gtkplugin.c:294
+msgid "Multiple plugins will be unloaded."
+msgstr "廬�廖廚�� �廨���� ��廚廨廡� �� ����廨��."
+
+#: ../src/gtkplugin.c:296
+msgid "Unload Plugins"
+msgstr "廚廨�廡 廬�廖廚��"
+
+#: ../src/gtkplugin.c:410
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">��廬� 廣\"�:</span>\t%s\n"
+"<span weight=\"bold\">�廬廨:</span>\t\t%s\n"
+"<span weight=\"bold\">廩� 廡��廛:</span>\t\t%s"
+
+#: ../src/gtkplugin.c:420
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">廩����: %s\n"
+"���廡 �廬 �廬廨 �廬�廖廝 �廣�����.</span>"
+
+#: ../src/gtkplugin.c:546
+msgid "Configure Pl_ugin"
+msgstr "���廨 �廬 �廬�廖廝"
+
+#: ../src/gtkplugin.c:604
+msgid "<b>Plugin Details</b>"
+msgstr "<b>廚廨�� �廬�廖廝</b>"
+
+#: ../src/gtkpounce.c:162
 msgid "Select a file"
 msgstr "��廨 廡��廛"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "��� ��廩 廡廩廨 廩�廩 ����� �廚廣���廬 廩��."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "廢�廨 廬���廬 廚廣���廬 ��廩�"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "廣廨�� 廩������ �廬���廬 廚廣���廬"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:520
+msgid "Pounce on Whom"
 msgstr "��� �����"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "廩� ��廩 �廡廩廨:"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "�廚廣� ��廩廨"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "�廬��廨"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "_��廬�廡"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_�廨��廡 ����廩�"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "��廨 ���廩�"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "�� 廚廣��"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "��廨 �廚廣���廬"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "��廩廬�廩 �廬��� ��廡��� ���廣�"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "��廩廬�廩 �廚廖�廡 ��廡��� ���廣�"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "��廨 廚廣��廬 廬����"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:571
+msgid "Pounce When Buddy..."
+msgstr "�廚廣� ��廩廨 ��廩-廡廩廨..."
+
+#: ../src/gtkpounce.c:579
+msgid "Si_gns on"
+msgstr "�廬��廨"
+
+#: ../src/gtkpounce.c:581
+msgid "Signs o_ff"
+msgstr "�廬�廬廡"
+
+#: ../src/gtkpounce.c:583
+msgid "Goes a_way"
+msgstr "�廬廨�廡/� ����廩�"
+
+#: ../src/gtkpounce.c:585
+msgid "Ret_urns from away"
+msgstr "���廨 ���廩�"
+
+#: ../src/gtkpounce.c:587
+msgid "Becomes _idle"
+msgstr "�廖廨 _廚廣���廬"
+
+#: ../src/gtkpounce.c:589
+msgid "Is no longer i_dle"
+msgstr "��廨 �� �廖廨/廬 廚廣���廬"
+
+#: ../src/gtkpounce.c:591
+msgid "Starts _typing"
+msgstr "�廬���/� ��廡��� ���廣�"
+
+#: ../src/gtkpounce.c:593
+msgid "Stops t_yping"
+msgstr "�廚廖�廡/� ��廡��� ���廣�"
+
+#: ../src/gtkpounce.c:595
+msgid "Sends a _message"
+msgstr "廩�_�� ���廣�"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:627
+msgid "Action"
+msgstr "廚廣���"
+
+#: ../src/gtkpounce.c:635
+msgid "Ope_n an IM window"
 msgstr "廚廬� ���� ���廣�廬"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: ../src/gtkpounce.c:637
+msgid "_Pop up a notification"
 msgstr "廬� �廬廨廣�"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:639
 msgid "Send a _message"
 msgstr "廩_�� ���廣�"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:641
 msgid "E_xecute a command"
 msgstr "�廚廣� �廚廡���"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:643
 msgid "P_lay a sound"
 msgstr "��� _廢���"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: ../src/gtkpounce.c:648
+msgid "Brows_e..."
 msgstr "廣��_�..."
 
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "_廣���..."
-
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:650
+msgid "Br_owse..."
+msgstr "廣�_��..."
+
+#: ../src/gtkpounce.c:651
 msgid "Pre_view"
 msgstr "_廬廢��� �廡����"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "廩��廨 廬���廬-廚廣���廬 �� ���廨 �廚廣�廬�"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "�廖廨 廬���廬 廚廣���廬"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:763
+msgid "Options"
+msgstr "/_�廚廩廨���廬"
+
+#: ../src/gtkpounce.c:771
+msgid "P_ounce only when my status is not available"
+msgstr "��� 廨廡 ��廩廨 ��� �� ����"
+
+#: ../src/gtkpounce.c:776
+msgid "_Recurring"
+msgstr "���廨"
+
+#: ../src/gtkpounce.c:1090
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "��� �廬� ���� 廩�廨廢��� ����廡 �廬 �廬���� 廣� %s 廣��廨 %s?"
+
+#: ../src/gtkpounce.c:1238
+msgid "Pounce Target"
+msgstr "��廨廬 �廬����"
+
+#: ../src/gtkpounce.c:1273
+msgid "Recurring"
+msgstr "���廨"
+
+#: ../src/gtkpounce.c:1320
+msgid "Buddy Pounces"
+msgstr "廬����廬 廚廣���廬"
+
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s �廬��� ��廬�� �� ���廣� (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s �廬��廨 (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ��廨 �廚廣���廬 (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ��廨 ���廩� (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s �廚廖�廡 ��廡��� �� ���廣� (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s �廬�廬廡 (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s �廖廨 廚廣���廬 (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s �廬廨�廡/� ����廩�. (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1463
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s 廩�� �� ���廣�. (%s)"
+
+#: ../src/gtkpounce.c:1464
 msgid "Unknown pounce event. Please report this!"
 msgstr "��廨廣� 廚廣���廬 �� ���廨廬. ��� ���� 廣� ��!"
 
-#: src/gtkprefs.c:623
+#: ../src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr "��廩��� �廣廬 廚廬��廬 廣廨�廬 廖�������"
+
+#: ../src/gtkprefs.c:638
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 "��廨 廣廨�廬 ������� �廨廩��� ����. 廣廨��廬 ��廩�廬 ��廬� ��廬廡�� 廣\"� �廨�廨廬� 廣� "
-"廨廩��廬�廣廨��廬."
-
-#: src/gtkprefs.c:658
+"廨廩��廬 �廣廨��廬."
+
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "廖��"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "廬���廨"
 
-#: src/gtkprefs.c:805
+#: ../src/gtkprefs.c:821
+msgid "_Hide new IM conversations"
+msgstr "�_��� 廩���廬 ��廩�廬"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+msgid "When away"
+msgstr "��廩廨 �廨��廡"
+
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "廩�� 廚廡���廬 \"廡�-����\" �� ���廨�廬 ����廣�廬"
 
-#: src/gtkprefs.c:807
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
 msgstr "�廢� 廚_�廨��� 廣� ���廣�廬 ���廖�廬"
 
-#: src/gtkprefs.c:809
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "�廢_� 廖���� 廩� ��廩� 廡廩廨"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "�廚廩廨 ����廢�廬 廩� 廖�� ��廩� �廡廩廨"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "��_�廣 ��廩� 廡廩廨 廩�廬/� �廡���/� ���"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: ../src/gtkprefs.c:845
+msgid "Highlight _misspelled words"
 msgstr "���廩 ��_��� 廣� 廩����廬 �廬��"
 
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr "�廬廩廬�廩 ������-��廡�"
+
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3763,161 +4532,160 @@
 "�廡廖�. :)  ABCDabcd12346�����"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "���廨�廬 �廨��廖��"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�廢� 廩���廬 ����廣�廬 ������廬 �_�廨��廖��廬"
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "�廢� ��廢� _廖��廨� 廣� ��� �廩����廬 ��廨��廖��廬"
 
-#: src/gtkprefs.c:878
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
 msgstr "_��廡��:"
 
-#: src/gtkprefs.c:880
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "��廣��"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "����"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "廩���"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "����"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "���� 廩����"
+
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
+msgstr "���� ����"
+
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
 msgstr "廩�_�� ��廩�"
 
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
+#: ../src/protocols/oscar/oscar.c:6107
 msgid "IP Address"
 msgstr "�廬��廬 IP"
 
-#: src/gtkprefs.c:944
-msgid "STUN Server:"
+#: ../src/gtkprefs.c:975
+msgid "ST_UN server:"
 msgstr "廩廨廬 STUN:"
 
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: ../src/gtkprefs.c:977
+msgid "_Autodetect IP address"
 msgstr "�廢_� �廬��廬 IP �������廬"
 
-#: src/gtkprefs.c:955
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
 msgstr "�廬��廬 IP ��廢���廬:"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "�廢���廬"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "�_��廨 ����廬 �廬 ��廖廝 ��廢���廬 ��廡廩�� ���"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: ../src/gtkprefs.c:1020
+msgid "_Start port:"
 msgstr "�廢��� _廨�廩���:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: ../src/gtkprefs.c:1027
+msgid "_End port:"
 msgstr "�廢��� _��廨���:"
 
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "���廨�廬 ��廬���"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "��� �廬���"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
 msgstr "_�廩廬�廩:"
 
-#: src/gtkprefs.c:1119
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "�廚�廚��"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "廚��廨��廨�"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "廚��廨廚�廡廖"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "�����"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
 msgstr "�廨�廨廬 ���� 廩� GNOME"
 
-#: src/gtkprefs.c:1124
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "廡��廡�廨�廨"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "������"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "��廖廡��廚"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "��廚廨�"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "��廬�� ��廩�廬"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "���廨廬 ��廚�廚�"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
 msgstr "_�廚�廚�:"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
 msgstr "_廚廬� �廬 �廡�廩�廨 ��廚�廚� ���:"
 
-#: src/gtkprefs.c:1203
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "�廚�廚� �廨�廨廬 �����"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "���� 廡���"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "�廨��廖�� ��廩�"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3926,56 +4694,83 @@
 "_����廬:\n"
 "(%s 廣��廨 URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "廨�廩��"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: ../src/gtkprefs.c:1297
+msgid "Log _format:"
 msgstr "���� �_廨�廩��:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
-msgstr "_廨廩�� �廬 �� ����廣�廬"
-
-#: src/gtkprefs.c:1266
+msgstr "廨廩�� �廬 �� ����_廣�廬 �������廬"
+
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "廨廩�� �廬 �� �廩�_��廬"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "廨廩�� �廬 �� 廩����� �廖���廖 ����� ��廣廨�廬"
+
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "���廨廬 �廢���"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "��� 廩廡�"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "��廬廨 廩廡�"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "廩廡�"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "廨���"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "廨�廣廩"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "��廬廨 廨�廣廩"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "��� 廨�廣廩"
+
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
-msgstr "�廢��廬 �廢���"
-
-#: src/gtkprefs.c:1455
+msgstr "廩��廬 �廢���"
+
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
 msgstr "廩�_��:"
 
-#: src/gtkprefs.c:1457
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "&廢廚廢廝"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
-msgstr "�����廬�"
-
-#: src/gtkprefs.c:1464
+msgstr "�������"
+
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "廚廡���"
 
-#: src/gtkprefs.c:1465
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
 msgstr "��� 廢�����"
 
-#: src/gtkprefs.c:1473
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3984,373 +4779,395 @@
 "廢��� �廚廡�_��:\n"
 "(%s 廣��廨 廡��廛)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "���廨�廬 �廢���"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "廢����� ��廩廨 �廩 ����� �廩��� ��_廡��"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "�廩�廣 廢����� ��廢� \"�� ��廢�\""
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1592
+msgid "Volume:"
+msgstr "������:"
+
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "�廨�廣� 廢���"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "���"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "��廨�廣"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "���廡�"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "�廚廖"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "��廨..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "廨��廡 ����廩�"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "廩�� ���廣�廬 ��廩�廬 �_廬�廨 ��廩廨 �廨��廡 ����廩�"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1747
+msgid "_Report idle time:"
+msgstr "_���� ��� ��廖廨 廚廣���廬:"
+
+#: ../src/gtkprefs.c:1750
+msgid "From last sent message"
+msgstr "���� 廩���廬 ����廣� ���廨���"
+
+#: ../src/gtkprefs.c:1752
+msgid "Based on keyboard or mouse use"
+msgstr "廣�-廚� 廚廣���廬 廣��廨 �� �廡��廬"
+
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "�廣�� �����_��:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "��廩廨 �廨��廡"
-
-#: src/gtkprefs.c:1659
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "��廩廨 �廨��廡 ��� �廖廨 廚廣���廬"
 
-#: src/gtkprefs.c:1662
-msgid "_Report idle time"
-msgstr "���� ���� _��廖廨 廚廣���廬"
-
-#: src/gtkprefs.c:1665
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "廨���廡 �������"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
 msgstr "廡�廣 廨���廡 �廣廬 ��廖廨 廚廣���廬"
 
-#: src/gtkprefs.c:1670
-#, fuzzy
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
-msgstr "_�廡�廬 �廚�� 廩廡��廣 廨���廡:"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "_�廡�廬 �廚�� 廡��廣廬 廨���廡:"
+
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
-msgstr "廩�� �廬��廬 �:"
-
-#: src/gtkprefs.c:1728
+msgstr "廩�� 廨���廡 �:"
+
+#. Signon status stuff
+#: ../src/gtkprefs.c:1806
+msgid "Status at startup"
+msgstr "廖���廖 �廣廬 ��廬���"
+
+#: ../src/gtkprefs.c:1808
+msgid "Use status from last _exit at startup"
+msgstr "�廩廬�廩 �廖���廖 ��廢��� ��廨��� �廣廬 ��廬���"
+
+#: ../src/gtkprefs.c:1814
+msgid "Status to a_pply at startup:"
+msgstr "廖���廖 ����� �廣廬 ��廬���:"
+
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "廣廨��廬 �������"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "廢�����"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "廨廩廬"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "�廚�廚�"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
 msgstr "廨���廡 ����廩� / ��廖廨 廚廣���廬"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "�廚廩廨 ��� �廩廬�廩 ��廢�廨 ��廬� 廡廩廨"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "�廚廩廨 廨廡 ��廩廬�廩�� �廨廩��廬 ��廩�-�廡廩廨 廩��"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "�廚廩廨 廨廡 ��廩廬�廩�� �����"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "�廖�� �廬 �� ��廩廬�廩��"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "�廖�� 廨廡 �廬 ��廩廬�廩�� 廩����"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "廚廨���廬"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "廩������ ��廣�廚�廬 �廚廨���廬 ���� ���."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "廡�廣 廚廨���廬 廣��廨:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "�廚廩廨 ��廩廬�廩"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "�廩 ��廡��� 廩� �廩廬�廩 廩�廨廢��� ��廚廩廨 ��廢�廨 廡廩廨 ��廬�."
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ��廚廩廨 ��廢�廨 廡廩廨 ��廬�."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
 msgstr "�廨廩�"
 
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "��廚廩廨 � %s ��廢�廨 ��廬� 廡廩廨?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "��� �廬/� ����/� 廩�廨廢��� ��廚廩廨 �-%s ��廢�廨 ��廬� 廡廩廨?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "�廖�� �廩廬�廩"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ��廖��."
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ��廖��."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
 msgstr "�廖��"
 
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "��廖�� �廬 %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "��� �廬/� ����/� 廩�廨廢��� ��廖�� �廬 %s?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "��"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:289
 msgid "Apply"
 msgstr "���"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:290 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "廖��廨"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1839
 msgid "That file already exists"
 msgstr "�廡��廛 ��廨 廡���"
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1840
 msgid "Would you like to overwrite it?"
 msgstr "�廩�廬�?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1884 ../src/gtkrequest.c:1925
 msgid "Save File..."
 msgstr "廩��廨� �廩�..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1885 ../src/gtkrequest.c:1926
 msgid "Open File..."
 msgstr "廚廬�..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "��廖廝"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "廨廩��廬 ��廨��"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "_��廨� 廨廩���"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "��廖廝 廩���"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "廬��廨"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
 msgstr "廖��"
 
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+#. Available status messages are plain text
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
+#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
+#: ../src/protocols/sametime/sametime.c:3274
+#: ../src/protocols/sametime/sametime.c:3280
+#: ../src/protocols/sametime/sametime.c:3286
+#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3278 ../src/protocols/yahoo/yahoo.c:3284
+#: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "���廣�"
 
-#: src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "廖���廖�� �廩�廨�"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
-msgstr "_�廩廬�廩:"
-
-#: src/gtksavedstatuses.c:584
+msgstr "�廩_廬�廩"
+
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "廬��廨 ��廨 �廩���廩, 廣��� ����廨 廬��廨 �����."
 
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "廖���廖 �廩��"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+#: ../src/gtksavedstatuses.c:879
+msgid "Different"
+msgstr "廩���"
+
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/yahoo/yahoo.c:2880
 msgid "Status"
 msgstr "�廢�"
 
-#: src/gtksavedstatuses.c:797
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
 msgstr "_廬��廨:"
 
-#: src/gtksavedstatuses.c:817
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
 msgstr "_�廢�:"
 
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
-#, fuzzy
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
 msgstr "�廩廬�廩 �廖���廖 廩��� 廣��廨 �廩����廬 �廖������"
 
-#: src/gtksound.c:61
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1188
+msgid "Sa_ve & Use"
+msgstr "廩��廨 ��廩廬�廩"
+
+#: ../src/gtksavedstatuses.c:1394
+#, c-format
+msgid "Status for %s"
+msgstr "�廢� 廣��廨 %s"
+
+#: ../src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "��廩 廡廩廨 ���廖"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "��廩 廡廩廨 �廬�廬廡"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63
 msgid "Message received"
 msgstr "���廣� �廬廡���"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "���廣� �廬廡���, �廬��� ���-廩��"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65
 msgid "Message sent"
 msgstr "���廣� �廩���"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "��廩�� ���廖 �廩���"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "��廩�� 廣�� �廬 �廩���"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "�廬� ���廨 �廩���"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "��廨�� ���廨�� �廩���"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "��廩�� ����廨 �廬 廩�� �廩���"
 
-#: src/gtksound.c:414
+#: ../src/gtksound.c:488
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "�� ��廬� ��廩��廣 廢���, ����� 廩廡��廛 \"%s\" �� 廡���."
 
-#: src/gtksound.c:430
+#: ../src/gtksound.c:504
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 "�� ��廬� ��廩��廣 廢��� ����� 廩���廨� ��廚廢�� \"廚廡���\", �� �廚廡��� �� ����廖�."
 
-#: src/gtksound.c:442
+#: ../src/gtksound.c:516
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4358,110 +5175,70 @@
 msgstr ""
 "�� ��廬� ��廩��廣 �廬 �廢��� ����� 廩�� ��廬� ��廨�廛 �廬 廚廡��廬 ��廩�廣� 廩�廡�廣�: %s"
 
-#: src/gtkstatusbox.c:197
+#: ../src/gtkstatusbox.c:362
 msgid "Typing"
 msgstr "�廡���/�"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:980 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "�廬��廨"
 
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "����"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "��廬� �廨��"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "���廬廡"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "��廬�� ��廩�廬"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "廩��廨� �廩�..."
-
-#: src/gtkstock.c:117
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "廬���_廨"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "廖��廨 �����"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "�廢� 廚廨���"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "����"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "_廣廨��"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_廚廬� ���廨"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "�_��廨"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: ../src/gtkutils.c:1303 ../src/gtkutils.c:1328
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "�廨廣� �廩���� ���� �廣廬 ��廖��� �廣��廬 %s: %s"
 
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#: ../src/gtkutils.c:1305 ../src/gtkutils.c:1330
 msgid "Failed to load image"
 msgstr "��廩��� �廣廬 �廣��廬 廬����"
 
-#: src/gtkutils.c:1495
+#: ../src/gtkutils.c:1405
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "�� ��廬� �廩��� �廬 �廖廚廨�� %s."
 
-#: src/gtkutils.c:1497
+#: ../src/gtkutils.c:1407
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "���� �� ���� ��廣��廨 廖廚廨��. 廬���廢/� �廩��� �廬 �廡�廢�� �廬�� �廖廚廨�� ���-���"
 
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#: ../src/gtkutils.c:1435 ../src/gtkutils.c:1444 ../src/gtkutils.c:1449
 msgid "You have dragged an image"
 msgstr "�廨廨廬 廬����"
 
-#: src/gtkutils.c:1526
+#: ../src/gtkutils.c:1436
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4469,23 +5246,23 @@
 "��廬� �廩��� 廬���� �� �廡��廛 ��廣�廨, �廩�� ��廬� ����廣� ��, �� ��廩廬�廩 �� �廬�廨 廖�� "
 "廣��廨 ��廩 �廡廩廨 ���."
 
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
+#: ../src/gtkutils.c:1440 ../src/gtkutils.c:1455
 msgid "Set as buddy icon"
 msgstr "廡�廣 ����廬 廖�� ��廩 �廡廩廨"
 
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#: ../src/gtkutils.c:1441 ../src/gtkutils.c:1456
 msgid "Send image file"
 msgstr "廩�� 廡��廛 廬����"
 
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#: ../src/gtkutils.c:1442 ../src/gtkutils.c:1456
 msgid "Insert in message"
 msgstr "���廖 �廬�� ����廣�"
 
-#: src/gtkutils.c:1535
+#: ../src/gtkutils.c:1445
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "��� �廨廢��� �廡��廣 �廬 �� ����廬 �廖�� 廩� ��廩 廡廩廨 ��?"
 
-#: src/gtkutils.c:1540
+#: ../src/gtkutils.c:1450
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4493,7 +5270,7 @@
 "��廬� �廩��� 廬���� �� �廡��廛 ��廣�廨, �廩�� ��廬� ����廣� ��, �� ��廩廬�廩 �� �廬�廨 廖�� "
 "廣��廨 ��廩 �廡廩廨 ���."
 
-#: src/gtkutils.c:1542
+#: ../src/gtkutils.c:1452
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4504,11 +5281,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1506
 msgid "Cannot send launcher"
 msgstr "�� ��廬� �廩��� �廬 廡��廛 ��廚廣��"
 
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1506
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4516,19 +5293,38 @@
 "�廨廨廬 廡��廛 �廚廣�� 廩� 廩���� �廣����. 廡廨�� ����� 廩廨廢�廬 �廩��� �廬 �� 廩��廚廣�� "
 "�廢��廣廣���, ��� �廬 ��廚廣�� 廣廢��."
 
-#: src/log.c:129
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "�廩��� �廡廩廨 �廡廩廡廩."
+
+#: ../src/log.c:165
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">�廬���廬 �廨�廩�� ��� 廚��廡廢�廬 廡廨���</font></b>"
 
-#: src/log.c:577
+#: ../src/log.c:547
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:558
+msgid "Plain text"
+msgstr "�廡廖� 廨���"
+
+#: ../src/log.c:569
+msgid "Old Gaim"
+msgstr "���� ��廩�"
+
+#: ../src/log.c:668
 msgid "Logging of this conversation failed."
 msgstr "廨�廩�� 廩��� ��, ��廩�."
 
-#: src/log.c:839
+#: ../src/log.c:969
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1037
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4537,7 +5333,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
 "�������&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1039
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4546,58 +5342,97 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
 "�������&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1096 ../src/log.c:1218
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� ��廢�� �廬 �廬�� �廨�廩��!</b></font>"
 
-#: src/log.c:967 src/log.c:1086
+#: ../src/log.c:1108 ../src/log.c:1230
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� �廡廨�� 廡��廛: %s</b></font>"
 
-#: src/log.c:1019
+#: ../src/log.c:1161
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <�廣��-�������>: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
+msgid "Unknown error"
+msgstr "廩���� �� ���廨廬"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "��-�廬��� ��廖廚廨 �廡廖� 廩� �廬�廖廝 %d (廢廨�� ����廬 %d)"
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "��-�廬��� ���廨廖廬 ABI %d.%d.x (廢廨�� %d.%d.x)"
+
+#: ../src/plugin.c:457
+msgid "Plugin does not implement all required functions"
+msgstr "�廬�廖廝 �� ���廩� �廬 �� �廚��廡廢��廬 ��廨�廩�廬"
+
+#: ../src/plugin.c:514
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "�廖廨 廬�廖廝 %s. ����廛 ��廬廡�� �廬 �廬�廖廝 ���廩 ���廖�廬 廩��廬."
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "���� �� �廢��� ��廣�� �廬 �廬�廖廝 廩��."
-
-#: src/plugin.c:360
+#: ../src/plugin.c:519
+msgid "Gaim encountered errors loading the plugin."
+msgstr "���� �廬廡� �廩���� �廣廬 �廣��廬 �廬�廖廝."
+
+#: ../src/plugin.c:542
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "�� ��廬� ��廣�� �廬 �廬�廖廝 %s."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "��廖廨 廚廣���廬"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: ../src/plugin.c:546
+msgid "Gaim was unable to load your plugin."
+msgstr "���� �� �廢��� ��廣�� �廬 �廬�廖廝 廩��."
+
+#: ../src/plugin.c:648
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "�廬�廖廝 �廬��� %s ��廩� �廣廬 �廣���."
+
+#: ../src/plugin.c:653
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "���� �廬廡� �廩���� �廣廬 廚廨�廡廬 �廬�廖廝."
+
+#. Send a message about the connection error
+#: ../src/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "�� ��廬� ��廡廩�� �廬廡廩�廨廬-���廣�廬 ���廖廬.\n"
+
+#: ../src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"�� �廢��� �廬廡廩廨 廣� 廩廨廬 �-mDNS ��廡���. ��� ��� ��廨 廨廛?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
-msgstr "<b>�廢�:</b> %s"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+msgstr ""
+"\n"
+"<b>�廢�:</b> %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>���廣�:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4609,311 +5444,350 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
-msgstr "廬�廖廝 廚廨���廡�� Yahoo"
+msgstr "廬�廖廝 廚廨���廡�� Bonjour"
+
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538
+msgid "Gaim User"
+msgstr "�廩廬�廩 � Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "廩� �廩廚��"
+#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:931
+msgid "Hostname"
+msgstr "廩� 廩廨廬"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/irc/irc.c:901
+#: ../src/protocols/msn/msn.c:1957 ../src/protocols/napster/napster.c:725
+#: ../src/protocols/sametime/sametime.c:5644 ../src/protocols/silc/silc.c:1856
 msgid "Port"
 msgstr "�_廢���"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
+#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "廩� 廚廨��"
 
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "廩� �廩廚��"
 
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+#: ../src/protocols/bonjour/bonjour.c:589 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "���\"�"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
+msgid "Token Error"
+msgstr "廩���廬 廣廨�"
+
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
+msgid "Unable to fetch the token.\n"
+msgstr "�� ��廬� ��廩�� �廬 �廣廨�.\n"
+
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
 msgid "Save Buddylist..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨..."
 
-#: src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:227
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� 廨�廡�, �� ��廬� ���廣 �廡��廛."
 
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
 msgid "Couldn't open file"
 msgstr "�� ��廬� �廚廬�� �廬 �廡��廛"
 
-#: src/protocols/gg/gg.c:156
+#: ../src/protocols/gg/gg.c:246
 msgid "Buddylist saved successfully!"
 msgstr "廨廩��廬 ��廩� �廡廩廨 �廩�廨� ��廢���!"
 
-#: src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "�� ��廬� �廚廬�� �廬 �廡��廛"
-
-#: src/protocols/gg/gg.c:199
+#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+msgid "Couldn't load buddylist"
+msgstr "�� ��廬� ��廣�� �廬 廨廩��廬 ��廩� �廡廩廨"
+
+#: ../src/protocols/gg/gg.c:281
 msgid "Load Buddylist..."
 msgstr "廚廬� 廨廩��廬 ��廩� 廡廩廨..."
 
-#: src/protocols/gg/gg.c:200
+#: ../src/protocols/gg/gg.c:282
 msgid "Buddylist loaded successfully!"
 msgstr "廨廩��廬 ��廩� �廡廩廨 ��廣�� ��廢���!"
 
-#: src/protocols/gg/gg.c:211
+#: ../src/protocols/gg/gg.c:293
 msgid "Save buddylist..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨..."
 
-#: src/protocols/gg/gg.c:254
-#, fuzzy
+#: ../src/protocols/gg/gg.c:337
 msgid "Fill in the registration fields."
-msgstr "�廩 ���� �廬 �廩��廬."
-
-#: src/protocols/gg/gg.c:259
+msgstr "�廩 ���� �廬 廩��廬 ��廨廩��."
+
+#: ../src/protocols/gg/gg.c:342
 msgid "Passwords do not match."
 msgstr "�廖�廖���廬 ���� 廬����廬."
 
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+#: ../src/protocols/gg/gg.c:351
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "�� ��廬� ��廢廣 �廨廩�� ��廩��� ��廩. ��廨廣� 廩����.\n"
 
-#: src/protocols/gg/gg.c:279
+#: ../src/protocols/gg/gg.c:364
 msgid "New Gadu-Gadu Account Registered"
 msgstr "��廩��� ��廨廩�� ��廩��� ���廩 廩� Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:280
+#: ../src/protocols/gg/gg.c:365
 msgid "Registration completed successfully!"
 msgstr "�廨�廩�� ��廢廣 ��廢���"
 
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+#: ../src/protocols/gg/gg.c:425
+msgid "e-Mail"
+msgstr "���\"�"
+
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1307
+msgid "Password"
+msgstr "廖�廖��"
+
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+msgid "Password (retype)"
+msgstr "廖�廖�� )廩��("
+
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+msgid "Enter current token"
+msgstr "��� 廣廨� �����"
+
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+msgid "Current token"
+msgstr "廣廨� �����"
+
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+msgid "Register New Gadu-Gadu Account"
+msgstr "�廢廣 廨�廩�� ��廩��� ��廩 廩� Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:452
+msgid "Please, fill in the following fields"
+msgstr "�廩 ���� �廬 �廩��廬 �����"
+
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+msgid "Unable to initiate a new search"
+msgstr "�� ��廬� ��廬�� ��廚�廩 ��廩"
+
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "�廩 �� ��廚�廩 �廚廣���. �廩 ����廬 �廖����."
+
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "�����"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:784 ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/oscar/oscar.c:6161
 msgid "City"
 msgstr "廣�廨"
 
-#: src/protocols/gg/gg.c:417
+#: ../src/protocols/gg/gg.c:577
 msgid "Year of birth"
 msgstr "廩�廬 ����"
 
-#: src/protocols/gg/gg.c:426
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
+#: ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Gender"
+msgstr "���"
+
+#: ../src/protocols/gg/gg.c:581
+msgid "Male or female"
+msgstr "��廨 �� �廡��"
+
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
+msgid "Male"
+msgstr "��廨"
+
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
+msgid "Female"
+msgstr "�廡��"
+
+#: ../src/protocols/gg/gg.c:587
 msgid "Only online"
 msgstr "廨廡 �廩����廨"
 
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
 msgid "Find buddies"
 msgstr "�廚廩 ��廩� 廡廩廨"
 
-#: src/protocols/gg/gg.c:432
+#: ../src/protocols/gg/gg.c:593
 msgid "Please, enter your search criteria below"
 msgstr "�廩 ����� �廬 ���廨�廬 ���廚�廩 ����"
 
-#: src/protocols/gg/gg.c:465
+#: ../src/protocols/gg/gg.c:630
 msgid "Fill in the fields."
 msgstr "�廩 ���� �廬 �廩��廬."
 
-#: src/protocols/gg/gg.c:476
+#: ../src/protocols/gg/gg.c:642
 msgid "Your current password is different from the one that you specified."
 msgstr "�廖�廖�� ������廬 廩�� 廩��� ��� 廩�����."
 
-#: src/protocols/gg/gg.c:491
+#: ../src/protocols/gg/gg.c:656
 msgid "Unable to change password. Error occured.\n"
 msgstr "�� ��廬� �廩��廬 �廬 �廖�廖��. ��廨廣� 廩����.\n"
 
-#: src/protocols/gg/gg.c:500
+#: ../src/protocols/gg/gg.c:665
 msgid "Change password for the Gadu-Gadu account"
 msgstr "廩�� 廖�廖�� 廣��廨 �廩��� �-Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:501
+#: ../src/protocols/gg/gg.c:666
 msgid "Password was changed successfully!"
 msgstr "�廖�廖�� 廩��廬� ��廢���!"
 
-#: src/protocols/gg/gg.c:535
-msgid "Token Error"
-msgstr "廩���廬 廣廨�"
-
-#: src/protocols/gg/gg.c:536
-msgid "Unable to fetch the token.\n"
-msgstr "�� ��廬� ��廩�� �廬 �廣廨�.\n"
-
-#: src/protocols/gg/gg.c:551
+#: ../src/protocols/gg/gg.c:699
 msgid "Current password"
 msgstr "廖�廖�� �����廬"
 
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "廖�廖��"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-msgid "Password (retype)"
-msgstr "廖�廖�� )廩��("
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-msgid "Enter current token"
-msgstr "��� 廣廨� �����"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-msgid "Current token"
-msgstr "廣廨� �����"
-
-#: src/protocols/gg/gg.c:574
+#: ../src/protocols/gg/gg.c:724
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "�廩 ����� �廬 廖�廖�廬� ������廬 �廖�廖�廬� ���廩� 廣��廨 �廩廬�廩 �廖廚廨: "
 
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
 msgid "Change Gadu-Gadu Password"
 msgstr "廩���� 廖�廖�廬 Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:649
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "��廨 廢'�� 廣��廨 ��廩 �廡廩廨: %s"
 
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
 msgid "Add to chat..."
 msgstr "��廖廝 �廩���..."
 
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廩廡廣"
-
-#: src/protocols/gg/gg.c:959
+#: ../src/protocols/gg/gg.c:950
+msgid "No matching users found"
+msgstr "�� ��廢�� �廩廬�廩�� 廬�����"
+
+#: ../src/protocols/gg/gg.c:951
+msgid "There are no users matching your search criteria."
+msgstr "�� ��廢�� �廩廬�廩�� �廬����� �廡廨��廨���� ���廚�廩 廩��."
+
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6264
+msgid "Unable to display the search results."
+msgstr "�� ��廬� ��廢�� �廬 廬�廢��廬 ���廚�廩."
+
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
+msgid "UIN"
+msgstr "�廖廚廨 �����"
+
+#: ../src/protocols/gg/gg.c:980
+msgid "Birth year"
+msgstr "廩�廬 ����"
+
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
 msgstr "��廨�� 廢���廨� �-Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:960
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "廬�廢��廬 ��廚�廩"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "����廨"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "廣廖�廡"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+msgid "Unable to read socket"
+msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廩廡廣"
+
+#: ../src/protocols/gg/gg.c:1201
+msgid "Buddy list downloaded"
+msgstr "廨廩��廬 ��廩� �廡廩廨 ��廣廬廡�"
+
+#: ../src/protocols/gg/gg.c:1202
+msgid "Your buddy list was downloaded from the server."
+msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� ��廣廬廡� �� �廩廨廬."
+
+#: ../src/protocols/gg/gg.c:1209
+msgid "Buddy list uploaded"
+msgstr "廨廩��廬 ��廩� �廡廩廨 �廩���"
+
+#: ../src/protocols/gg/gg.c:1210
+msgid "Your buddy list was stored on the server."
+msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� ���廖�� 廣� �廩廨廬"
+
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+msgid "Connection failed."
+msgstr "��廬��廨�廬 ��廩��."
+
+#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "�廖��"
 
-#: src/protocols/gg/gg.c:1129
+#: ../src/protocols/gg/gg.c:1468
 msgid "Add to chat"
 msgstr "��廖廝 �廩���"
 
-#: src/protocols/gg/gg.c:1133
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unblock"
 msgstr "�廖廨 �廖���"
 
-#: src/protocols/gg/gg.c:1149
+#: ../src/protocols/gg/gg.c:1481
+msgid "Block"
+msgstr "�廖��"
+
+#: ../src/protocols/gg/gg.c:1498
 msgid "Chat _name:"
 msgstr "廩� _廢'��:"
 
-#: src/protocols/gg/gg.c:1183
-msgid "Connection failed."
-msgstr "��廬��廨�廬 ��廩��."
-
-#: src/protocols/gg/gg.c:1357
+#: ../src/protocols/gg/gg.c:1724
 msgid "Chat error"
 msgstr "廩���� �廢'��"
 
-#: src/protocols/gg/gg.c:1358
+#: ../src/protocols/gg/gg.c:1725
 msgid "This chat name is already in use"
 msgstr "廩� �廢'�� ��� ��廨 �廩���廩"
 
-#: src/protocols/gg/gg.c:1435
+#: ../src/protocols/gg/gg.c:1808
 msgid "Not connected to the server."
 msgstr "�� ����廨 �廩廨廬."
 
-#: src/protocols/gg/gg.c:1456
-#, fuzzy
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr "�� ��廬� ��廩�� �廬 �廣廨�.\n"
-
-#: src/protocols/gg/gg.c:1472
-msgid "e-Mail"
-msgstr "���\"�"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-msgid "Register New Gadu-Gadu Account"
-msgstr "�廢廣 廨�廩�� ��廩��� ��廩 廩� Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr "�廩 ���� �廬 �廩��廬 �����"
-
-#: src/protocols/gg/gg.c:1515
-msgid "Change password"
-msgstr "廩�� 廖�廖��"
-
-#: src/protocols/gg/gg.c:1520
+#: ../src/protocols/gg/gg.c:1831
+msgid "Find buddies..."
+msgstr "�廚廩 ��廩� 廡廩廨..."
+
+#: ../src/protocols/gg/gg.c:1837
+msgid "Change password..."
+msgstr "廩�� 廖�廖��..."
+
+#: ../src/protocols/gg/gg.c:1843
 msgid "Upload buddylist to Server"
 msgstr "廩�� �廬 廨廩��廬 ��廩� �廡廩廨 �廩廨廬"
 
-#: src/protocols/gg/gg.c:1523
+#: ../src/protocols/gg/gg.c:1847
 msgid "Download buddylist from Server"
 msgstr "廩��廝 �廬 廨廩��廬 ��廩� �廡廩廨 ��廩廨廬"
 
-#: src/protocols/gg/gg.c:1526
+#: ../src/protocols/gg/gg.c:1851
 msgid "Delete buddylist from Server"
 msgstr "��廡 �廬 廨廩��廬 ��廩� 廡廩廨 ��廩廨廬"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛"
-
-#: src/protocols/gg/gg.c:1532
-msgid "Load buddylist from file"
-msgstr "�廣� �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛"
+#: ../src/protocols/gg/gg.c:1855
+msgid "Save buddylist to file..."
+msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛..."
+
+#: ../src/protocols/gg/gg.c:1859
+msgid "Load buddylist from file..."
+msgstr "�廣� �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛..."
 
 #. magic
 #. major_version
@@ -4926,117 +5800,119 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
 msgstr "�廣廨�廬 ���廣�廬 廚�廚��廨�廬 �廚����"
 
-#: src/protocols/gg/gg.c:1665
+#: ../src/protocols/gg/gg.c:1998
 msgid "Gadu-Gadu User"
 msgstr "�廩廬�廩 Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
 #, c-format
 msgid "Unknown command: %s"
 msgstr "廚廡��� ��廬� ���廨廬: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1290
 #, c-format
 msgid "current topic is: %s"
 msgstr "���廩� ���: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1294
 msgid "No topic is set"
 msgstr "��� ��廬廨廬"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
 msgstr "�廣�廨廬 �廡��廛 ��廩��"
 
-#: src/protocols/irc/dcc_send.c:273
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "���� �� �廢��� �廚廬�� �廢��廬-廡廩�."
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "廩���� ��廢�廬 ����廣� �����廬"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "��� ���廣� ����廬"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "��� ���廣� ����廬 �����廖廬 �����廨 ��."
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "���廣廬 ���� 廣��廨 %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "�廩廨廬 �廬�廬廡"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "�廢� �廬 ���廣廬 ����"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_廣廨�廛:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_廖�廖��:"
 
-#: src/protocols/irc/irc.c:238
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "�廖�廨 �廩��廬 �-IRC ����� 廨�����"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:889
 msgid "SSL support unavailable"
 msgstr "��� 廬���� �-SSL."
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
+#: ../src/protocols/simple/simple.c:1427
 msgid "Couldn't create socket"
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣 "
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:420
+#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
 msgid "Couldn't connect to host"
 msgstr "�� ��廬� ��廬��廨 �廩廨廬"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:447
 msgid "Connection Failed"
 msgstr "��廬��廨�廬 ��廩��"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:450
 msgid "SSL Handshake Failed"
 msgstr "�廩� ����廢廬 ��� 廩� SSL"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "廩���� �廡廨���"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "�廩廬�廩��"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "��廩�"
 
@@ -5048,34 +5924,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:878
 msgid "IRC Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:879
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "廬�廖廝 廚廨���廡�� IRC 廩廚��廬 ���廖"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:898 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1906
+#: ../src/protocols/napster/napster.c:720
+#: ../src/protocols/sametime/sametime.c:5639 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1663
 msgid "Server"
 msgstr "廩廨廬"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:904
 msgid "Encodings"
 msgstr "廡����"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:907 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
+#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "廩� �廩廬�廩"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:910
 msgid "Real name"
 msgstr "廩� ���廬�"
 
@@ -5083,215 +5962,231 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: ../src/protocols/irc/irc.c:918
 msgid "Use SSL"
 msgstr "�廩廬�廩 �-SSL"
 
-#: src/protocols/irc/msgs.c:105
+#: ../src/protocols/irc/msgs.c:103
 msgid "Bad mode"
 msgstr "�廢� �� 廬廡��"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:114
 #, c-format
 msgid "You are banned from %s."
 msgstr "��廖�� ��廩廬� � %s/"
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:115
 msgid "Banned"
 msgstr "�廖��"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:132
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "�� ��廬� ��廖�� %s: 廨廩��廬 ��廖��� ����"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "�����"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:214
 msgid " <i>(ircop)</i>"
 msgstr " <i>(廩��廨 廢�'�)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:215
 msgid " <i>(identified)</i>"
 msgstr " <i>(�����)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "廩� ���廬�"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "�廨�廣 �-"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:242
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>�� 廚廣�� ��廨:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:244
 msgid "Online since"
 msgstr "����廨 ���"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>廩� �廬��廨 �����廨:</b> ����<br>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:316
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 廩��� �廬 ���廩� ����廬: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:321
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "���廩� 廩� %s ���: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:338
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "���廣廬 �� ���廨廬 '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339
 msgid "Unknown message"
 msgstr "���廣廬 �� ���廨廬"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "���� 廩�� ���廣� 廩廩廨廬 �-IRC �� ����."
 
-#: src/protocols/irc/msgs.c:363
+#: ../src/protocols/irc/msgs.c:362
 #, c-format
 msgid "Users on %s: %s"
 msgstr "�廩廬�廩�� �-%s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:490
 msgid "Time Response"
 msgstr "�廣�� ���"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:491
 msgid "The IRC server's local time is:"
 msgstr "�廩廣� �廡���廬 �廢� 廩廨廬 �-IRC ���:"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:502
 msgid "No such channel"
 msgstr "��� ��� 廣廨�廛"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:513
 msgid "no such channel"
 msgstr "��� ��� 廣廨�廛"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:516
 msgid "User is not logged in"
 msgstr "��廩廬�廩 �� ����廨"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such nick or channel"
 msgstr "�� 廡��� ��� �廩廬�廩 �� 廣廨�廛"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:541
 msgid "Could not send"
 msgstr "廩���廬 ��廖廨 ��廩��"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "�廢�廨廚�廬 � %s ��廨廩廬 �����."
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:598
 msgid "Invitation only"
 msgstr "������ ����"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:699
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��廣�廬 廣\"�: %s (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "��廣� 廣\"� %s (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:727
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�廢� (%s %s) 廣\"� %s"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+msgid "Invalid nickname"
+msgstr "廩� ��廩廬�廩 �� ��廡�"
+
+#: ../src/protocols/irc/msgs.c:814
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "������ 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
+
+#: ../src/protocols/irc/msgs.c:818
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "廩� ��廩��� 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "�廩� �廩���� ������"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "��� �廚廩廨�廬 �廩��廬 �����"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:879
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "廣��廬 �廬 �廣廨�廛%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:921
 msgid "Error: invalid PONG from server"
 msgstr "廩����: �廬廡�� PONG �� 廬廡廝 ��廩廨廬"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:923
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "�廣�� PING �� ��廩���� 廩�: %lu 廩���廬"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:998
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�� ��廬� ��廢�廨廝 � %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�� ��廬� ��廢�廨廝 �廣廨�廛"
 
-#: src/protocols/irc/msgs.c:1019
+#: ../src/protocols/irc/msgs.c:1033
 msgid "Nick or channel is temporarily unavailable."
 msgstr "廩� ������ �� �廣廨�廛 �� ������ �廨�廣."
 
-#: src/protocols/irc/msgs.c:1031
+#: ../src/protocols/irc/msgs.c:1045
 #, c-format
 msgid "Wallops from %s"
 msgstr "��廚� �-%s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;廚廣��� ���廢�廣&gt;: 廚廣� 廚廣��� ."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
 "away [���廣�]:  廡�廣 ���廣廬 廨���廡 ����廩�, �� �廩廬�廩 ��� ���廣� ����廨 ������廬."
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: 廩�� 廚廡��� �� chanserv"
+
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5299,7 +6194,7 @@
 "deop &lt;廩�1&gt1; [廩�2] ...:  �廖廨 廖���廖 廩� �廚廣�� �廣廨�廛 ���廩��. ���� ����廬 "
 "�廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� ��."
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5309,7 +6204,7 @@
 "��� ���廨 �� �廣廨�廛 ��廢� 廩� 廬���� (+m). ���� ����廬 �廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� "
 "��."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5317,7 +6212,7 @@
 "invite &lt;廩�&gt; [��廨]:  ���� ��廩�� ��廢�廨廝 ���� �廣廨�廛 ��廬��, �� �廣廨�廛 "
 "������."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5325,7 +6220,7 @@
 "j &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, 廣� "
 "�廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5333,7 +6228,7 @@
 "join &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, "
 "廣� �廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5341,7 +6236,7 @@
 "kick &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ��廣廨�廛. 廢廨�� ����廬 �廚廣�� �廣廨�廛 ��� "
 "�廣廩�廬 ��廬."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5349,11 +6244,15 @@
 "list: �廢� 廨廩��� 廩� ��廨� 廢'�� �廨廩廬. <i>���廨�, �廩 廩廨廬�� 廩��廬廡� ��廬� �廨�廣 ��廢�廣 "
 "廚廣��� ��.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;廚廣��� ���廢�廣&gt;:  �廢廣 廚廣���"
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: 廩�� 廚廡��� �� memoserv"
+
+#: ../src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5361,22 +6260,26 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;廩� �����|廣廨�廛&gt;:  廡�廣 �� �廖廨 �廢�� 廣廨�廛 "
 "�� �廩廬�廩."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 "msg &lt;廩� �����&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [廣廨�廛]:  �廢� �廬 廨廩��廬 ��廩廬�廩�� 廩�廨�廣 �廣廨�廛."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;����� ��廩&gt;:  廩���� 廩� ������ 廩��."
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: 廩�� 廚廡��� �� nickserv"
+
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5384,7 +6287,7 @@
 "op &lt;廩� �����1&gt; [廩� �����2] ...:  ��廬� 廖���廖 廩� �廚廣�� 廣廨�廛 ���廩��. 廣��� "
 "����廬 �廚廣�� 廣廨�廛 ��廢廣 廚廣��� ��."
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5392,14 +6295,18 @@
 "operwall &lt;���廣�&gt;:  �� ���� ���廣/廬 �� �� 廣�廩�, ��廨�� �廬/� �� ����/� "
 "��廩廬�廩 ���."
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr " operserv: 廩�� 廚廡��� �� operserv"
+
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 "part [��廨] [���廣�]:  廣��� �廬 ���廨 ������, �� ��廨 �廖����, 廣� �廚廩廨�廬 ����廣�."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5407,22 +6314,22 @@
 "ping [廩� �����]:  廩��� ��� ����廬 �廬���� 廩� �廩廬�廩 (�� 廩� �廩廨廬 �� �� 廢���� "
 "�廩廬�廩."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 "query &lt;廩� �廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [���廣�]:  �廬�廬廡�廬 ��廩廨廬, 廣� �廚廩廨�廬 ����廣�."
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  廩�� 廚廡��� �廩�廨�廬 �廩廨廬."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5430,19 +6337,19 @@
 "remove &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ���廨. 廢廨�� ����廬 �廚廣�� �廣廨�廛 "
 "��廢廣 廚廣��� ��."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: �廢�� �廬 �廩廣� ��廡���廬 �廩廨廬 �-IRC."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [��廩� ��廩]:  �廢� �� 廩�� �廬 ��廩� �廣廨�廛."
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  廡�廣 �� �廖廨 �廢� �廩廬�廩."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5450,758 +6357,766 @@
 "voice &lt;廩� �����1&gt; [廩� �����2] ...:  廬� 廖���廖 ����廨 ���廩��. ���� ����廬 "
 "�廚廣�� �廣廨�廛 ��廢廣 廚廣��� ��."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;���廣�&gt;:  �� ���� ���廣/廬 �� ��, �廬/� ��廨�� �� ���� ��廩廬�廩 ���."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [廩廨廬] &lt;廩� �����&gt;:  �廩� ���廣 廣� �廩廬�廩."
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "��� �廣�� �-%s: %lu 廩���廬"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "廚���"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "�廣�� CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1710 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
+#: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "���廬廡."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 msgstr ""
 "�廩廨廬 ��廨廩 TLS/SSL��廬��廨�廬.  �廩 ����廨 �-\"�廩廬�廩 �-TLS �� ����\" ����廨�廬 ��廩���"
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "�廩廨廬 ��廨廩 TLS/SSL ��廬��廨�廬. �� ��廢�� 廬���� �-TLS/SSL."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "廩��廣� �廬���� ��廩廨廬"
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234
+msgid "Server couldn't authenticate you without a password"
+msgstr "�廩廨廬 �� ��� �廖��� ���廬 ��廬� ��� 廖�廖��"
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "����廬 �� ��廢廚�"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬.���廩�� ��� ��廬?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "�廩廨廬 �� 廬��� �����廬 ��廝 廬廢�廨�"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "廩��廣� �廬���� ��廩廨廬"
+
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "廬廩��廬 ����廬 �� 廬廡廚� ��廩廨廬"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/auth.c:719
+msgid "SASL error"
+msgstr "廩���廬 SASL"
+
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "廩� ���"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "廩� �廩廚��"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
 msgid "Given Name"
 msgstr "廩� 廚廨��"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
 msgid "URL"
 msgstr "廡�廩�廨"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
 msgid "Street Address"
 msgstr "�廬��廬"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
 msgid "Extended Address"
 msgstr "���廣 �廬��廬 ��廨��"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
 msgid "Locality"
 msgstr "��廡��"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
 msgid "Region"
 msgstr "����廨"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:794
 msgid "Postal Code"
 msgstr "��廡��"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "�����"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "��廚��"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "廩� ���廨���"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
 msgid "Organization Unit"
 msgstr "���廡�"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
 msgid "Role"
 msgstr "廬廚廡��"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6133
 msgid "Birthday"
 msgstr "��� ����廬"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "廣廨�� �廬 �-Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "�� �廚廨���� ���� �� ���廨�. �廩 ����� 廨廡 �廬 ����廣 廩�廬/� �廨��廩/� ��� �廬廬."
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "����� Jabber"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1909
 msgid "Resource"
 msgstr "�廩��"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "廩� ��廢廣�"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "�廬��廬"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:725
 msgid "P.O. Box"
 msgstr "廬��廬 ���廨"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Photo"
 msgstr "廬廢���"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Logo"
 msgstr "廖��"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1042
 msgid "Un-hide From"
 msgstr "�廢� 廬���廬"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1046
 msgid "Temporarily Hide From"
 msgstr "�廖廬廨 �廬 �廬���廬 ����廬"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1054
 msgid "Cancel Presence Notification"
 msgstr "��� �廬廨廣廬 �����廬"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1061
 msgid "(Re-)Request authorization"
 msgstr "�廡廩 ����廬 (���廩)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1070
 msgid "Unsubscribe"
 msgstr "��� �廬 ����� "
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "廩����"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "廚�廚��"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
 msgid "Extended Away"
 msgstr "�廣�廨�廬 ���廩�廬"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "�� �� ��廚廨�廣"
 
-#: src/protocols/jabber/buddy.c:1235
+#: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
+msgstr "���� 廬�廢��廬 ���廚�廩 廩��"
+
+#: ../src/protocols/jabber/buddy.c:1381
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr "�廩 ����� ��� �� ��廬廨 �� �廩��廬 ���廢�廣 ��廚�廩 廩� �廩廬�廩� Jabber �廬�����."
+
+#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:769
+#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "廩� 廚廨��"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:774
+#: ../src/protocols/oscar/oscar.c:6111
 msgid "Last Name"
 msgstr "廩� �廩廚��"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1400
 msgid "E-Mail Address"
 msgstr "�廬��廬 ���\"�"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1409 ../src/protocols/jabber/buddy.c:1410
 msgid "Search for Jabber users"
-msgstr "�廚廩 ��廩 廡廩廨 �廚� �廬��廬 ����廨 ���廨廡�廨��� 廩��"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "�廚廩 �廩廬�廩� Jabber"
+
+#: ../src/protocols/jabber/buddy.c:1424
 msgid "Invalid Directory"
-msgstr "�廖廚廨 廩���� �� 廬廡廝."
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "廖廚廨��� �� ��廡�廬"
+
+#: ../src/protocols/jabber/buddy.c:1441
 msgid "Enter a User Directory"
-msgstr "�� ���� �廩��� 廖廚廨���"
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "��廖 �廖廚廨��廬 �廩廬�廩"
+
+#: ../src/protocols/jabber/buddy.c:1442
 msgid "Select a user directory to search"
-msgstr "�廩 ����廨 廩廨廬 �廣��� �廬�廩���"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "��廨 廖廚廨��廬 �廩廬�廩 ���廚�廩"
+
+#: ../src/protocols/jabber/buddy.c:1445
 msgid "Search Directory"
-msgstr "廬�廢��廬 ��廚�廩"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "�廚廩 �廖廚廨���"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_��廨:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_廩廨廬:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "�_����:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ���� 廩� ��廨 廬廡廝"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "廩� ���廨 ���� 廬廡廝"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ���� 廩� 廬廡廝 �廩廨廬"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "廩� 廩廨廬 �� 廬廡廝"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ���� �����-��廨 廬廡廝"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "�����-��廨 �� 廬廡廝"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "廩���廬 ���廨�廬"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "�� ��廬� ��廢廣 ���廨�"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "廩���� ����廨�廬 ���廨"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "�� ��廬� �廩��廬 ���廨�廬 ��廨 ��"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "廩���廬 �廨廩��"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "�� ��廬� �廩��廬 �廬 ����� ��廩廬�廩 ���廨� 廢'�� 廩� �廖�� MUC"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "廩���� �廣廬 ��廨�廬 廨廩��廬 ���廨��"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "廩� �廩廨廬 ���� 廬廡��"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "�廩 ����� 廩廨廬 �廣���"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "�廩 ����廨 廩廨廬 �廣��� �廬�廩���"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "�廚廩 ��廨��"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "廩���� �廣廬 ��廬��� �廬廡廩�廨廬"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "廩���� ��廬���"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:353 ../src/protocols/jabber/jabber.c:387
 msgid "Read Error"
 msgstr "廩���� �廡廨���"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:473 ../src/protocols/jabber/jabber.c:899
 msgid "Unable to create socket"
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
 msgid "Invalid Jabber ID"
 msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:589
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�廨�廩�� 廩� %s@%s ��廢廣 ��廢���"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
 msgid "Registration Successful"
 msgstr "廨�廩�� ��廢廣 ��廢���"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "廩���� �� ���廣�"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
 msgid "Registration Failed"
 msgstr "�廨�廩�� ��廩�"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
 msgid "Already Registered"
 msgstr "������ ��廨 廨廩��."
 
-#: src/protocols/jabber/jabber.c:643
+#: ../src/protocols/jabber/jabber.c:759
 msgid "E-Mail"
 msgstr "���廨"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/oscar/oscar.c:6162
 msgid "State"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "��廚��"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:809
 msgid "Date"
 msgstr "廬�廨��"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:817
 msgid "Please fill out the information below to register your new account."
 msgstr ".�廩 ����� �廬 ����廣 ���� ��� �廨廩�� �廬 ��廩��� ���廩 廩��"
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
 msgid "Register New Jabber Account"
 msgstr "廨廩�� �廩��� Jabber ��廩"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:984
 msgid "Initializing Stream"
 msgstr "��廬�� �廨�"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:990 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "���廬"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:999
 msgid "Re-initializing Stream"
 msgstr "��廬�� �廬 ��廨� ���廩"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
 msgid "Not Authorized"
 msgstr "�� ��廨廩�"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "廩����"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "��廬 (�� ��廩��)"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "��廬"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "��"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "��� (�� ��廩��)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "���"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
 msgstr "廣��廚�廬"
 
-#: src/protocols/jabber/jabber.c:1093
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "廖�廖�� 廩��廬�"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "�廖�廖�� 廩�� 廩��廬�."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "廩���� ����� 廩���� �廖�廖��"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "廖�廖�� (廩��廬)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "��� �廬 �廖�廖�� ���廩� 廩��."
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "���廣 ���� 廣� ��廩廬�廩"
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8404
+#: ../src/protocols/silc/silc.c:1019
+msgid "Set User Info..."
+msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "廩�� 廖�廖��"
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8415
+#: ../src/protocols/silc/silc.c:1015
+msgid "Change Password..."
+msgstr "廩�� 廖�廖��..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "_�廚廩 �廣��廨: "
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1338
+msgid "Search for Users..."
+msgstr "_�廚廩 �廩廬�廩��..."
+
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "�廡廩� 廩����"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "�廬��廩�廬"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "�廨� ��廩�."
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "�廖�廨"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "��-��廢�"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "廩���� 廚����廬 �廩廨廬"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "廚廨�� �� ��廢�"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
 
-#: src/protocols/jabber/jabber.c:1273
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "�� 廡���"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "�� ��廨廩�"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "��廨廩 廬廩���"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "��廣� �� ����"
 
-#: src/protocols/jabber/jabber.c:1285
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "��廨廩廬 �廨廩��"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "廩廨廬 �� ��廢�"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "廬� ���� ���廡廢� �廬廡廩�廨廬 廩廨廬"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "廣��廖 �廬廨 廣� �廩廨廬"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "�廩�廨�廬 ���� ����"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "��廨廩 ����"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "�廡廩� �� 廢廚����"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "����廬 ����"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1463
 msgid "Incorrect encoding in authorization"
 msgstr "廡���� 廩��� �����廬"
 
-#: src/protocols/jabber/jabber.c:1309
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Invalid authzid"
 msgstr "authzid �� 廬廡廝"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "������ �����廬 �� 廬廡廝"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "������ �����廬 ��廩 ���"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1477
 msgid "Temporary Authentication Failure"
 msgstr "�廩� ���� �����廬"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Authentication Failure"
 msgstr "�廩� �����廬"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "���� �� 廬廡��"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "�廬�� �廡廩廨-廩� 廩���"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
 msgstr "�廬��廩���廬 �廩����"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "��� ���� ���廡廢� �����廨"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "���廨� �廣��"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "��廨� �� ���廨"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "��廬��廬 �� �����"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "����� �� 廬廡��"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "�廡廩廨-廩� �� 廬廡廝"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "XML 廩���"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "��廨��� �� 廬�����"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "����� ��廖��"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "廩���廬 廬廡廩�廨廬 �廢� ��廨��廡"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "����廬 �廩����"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "XML �����"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "廢廚� ���廨� ��廨"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
 msgstr "����� ��廣廨�廬"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "�廡廨� �� ����廨 �廨�廩"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "廡���� 廩�� �廬��"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "廖�� 廖���� 廩�� �廬��廬"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "��廨廖� ��� 廬����"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML �� ����� ����"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "廩���� ��廨�"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�� ��廬� ��廖�� �廩廬�廩 %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "����廖 �� ���廨: %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1625
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "�� ��廬� ����廖 �廬 �廩廬�廩 %s �廬�廨 \"%s\""
 
-#: src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1644
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "廬廚廡�� �� ���廨: \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1651
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "�� ��廬� �廡��廣 廬廚廡�� \"%s\" 廣��廨 �廩廬�廩: %s"
+
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�� ��廬� ��廣�� ��廩廬�廩 %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [��廨]:  廣��� �廬 ���廨."
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register:  �廨廩� ���廨 廢'��."
 
-#: src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [��廩� ��廩]:  �廢� �� 廩�� �廬 ���廩�."
 
-#: src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;�廩廬�廩&gt; [��廨]:  �廖�� �廩廬�廩 �� ���廨."
 
-#: src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6209,19 +7124,27 @@
 "affiliate &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
 "廣� ���廨."
 
-#: src/protocols/jabber/jabber.c:1589
+#: ../src/protocols/jabber/jabber.c:1777
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
+"廣� ���廨."
+
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;�廩廬�廩&gt; [��廨]:  ���� �廩廬�廩 ���廨."
 
-#: src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;��廨&gt; [廩廨廬]:  �廢�廨廝 �廢'�� �廩廨廬 ��."
 
-#: src/protocols/jabber/jabber.c:1601
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;�廩廬�廩&gt; [��廨]:  �廣� �廩廬�廩 ����廨."
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1800
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;�廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 ��廨."
@@ -6236,133 +7159,132 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1884 ../src/protocols/jabber/jabber.c:1886
 msgid "Jabber Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1912
 msgid "Use TLS if available"
 msgstr "�廩廬�廩 �-TLS ����� �����"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1917
 msgid "Require TLS"
 msgstr "�廨�廩 TLS"
 
-#: src/protocols/jabber/jabber.c:1722
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Force old (port 5223) SSL"
 msgstr "��廛 廩���廩 �-SSL �廩� )�廢��� 5223("
 
-#: src/protocols/jabber/jabber.c:1727
+#: ../src/protocols/jabber/jabber.c:1925
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�廚廩廨 ��廩廨�廨 �� ��廢廚� �廬廡廩�廨廬 �� ��廢廚�廬"
 
-#: src/protocols/jabber/jabber.c:1732
+#: ../src/protocols/jabber/jabber.c:1930 ../src/protocols/simple/simple.c:1669
 msgid "Connect port"
 msgstr "�廢��廬 ��廬��廨�廬"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1934 ../src/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "廩廨廬 ��廬��廨�廬"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "���廣� �-%s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 廩��� �廬 ���廩� ����廬: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "���廩� ���: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "廬廡�� ��廩��� ���廣� �� %s: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "���廣廬 廩���� �� ���廨廬 (Jabber)"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr "(廡�� %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "廩���廬 廚�廣��� XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "廩���� �� ���廨廬 ������廬"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "��廩廬�廩 %s 廨�廢� ���廖�廝 %s �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "��廩�廨"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
+#: ../src/protocols/oscar/oscar.c:7405
+msgid "_Authorize"
+msgstr "�廩廨"
+
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
+#: ../src/protocols/oscar/oscar.c:7406
+msgid "_Deny"
 msgstr "���"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:376
+#: ../src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "廢�廨 ��廨 ��廩"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "���廨 ���廩 廩�廢廨廬. ��� �廨廢��� �廩��廬 �廬 ����廨�廬 廩��, �� �廡�� �廬 �廨�廨�廬 �����?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
+#: ../src/protocols/jabber/presence.c:380
+msgid "_Configure Room"
 msgstr "���廨�廬 ���廨"
 
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "廡�� �廬 �廨�廨�廬 ����"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:382
+msgid "_Accept Defaults"
+msgstr "廡�� �廬 �廨�廨�廬 �����"
+
+#: ../src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "廩���� �廩��� %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "廩���� ��廢�廨廚�廬 �廢'�� %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:726
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�� ��廬� �廩��� �廬 �廡��廛 �� %s, ��廩廬�廩 �� 廬��� ��廣�廨�廬 廡�廢��"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "�廩� �廩���廬 廡��廛"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "��廨�廣 廖���廨�� 廨廩��廬 ��廩� �廡廩廨 �-%s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6371,270 +7293,270 @@
 "%s �廨廩��� ��廡���廬 ��� �廬�� �廡��廢� \"%s\" �� �� �廨廩��� 廩廣� �廩廨廬. ��� �廨廢��� "
 "���廖�廝 ��廩 廡廩廨 ��?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr "%s �廨廩��� ��廡���廬 �� �� �廨廩��� 廩廣� �廩廨廬. ��� �廨廢��� ���廖�廝 ��廩 廡廩廨 ��?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "�� ��廬� �廚廣�� ���廣�"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "廩���廬 廬���廨 (��廨�� ��� �����)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "�廬��廬 ���\"� �� 廬廡廚�"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "��廩廬�廩 �� 廡���"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "廢廨�� �廬��廬 ���� �������"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "��廨 ����廨"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "廩� ��廩廬�廩 廩���"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "廩� �����廬� 廩���"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "�廨廩��� ����"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "��廨 廩�"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "�� ��廢� �廨廩���"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "��廩廬�廩 �� ����廨"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "��廨 ��廢� ��"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "��廨 �廨廩��� ��廚���"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "��廬廨 ���� 廡��廢�廬"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "廡��廢� �� 廬廡���"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "��廩廬�廩 �� 廩��� �廡��廢�"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "廩� �廡��廢� �廨�� ���"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "�� ��廬� ��廖�廨 �廬 廡��廢� �廚廖"
 
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+#: ../src/protocols/msn/error.c:95
+msgid "Tried to add a user to a group that doesn't exist"
 msgstr "��廖��� ���廖�廝 ��廩 廡廩廨 �廡��廢� 廩���� 廡���廬"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "廬廡�� ��廨�����"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "�廩� ��廬廨廣廬 �廣�廨�"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "廩��廬 ���廢�� �廖廨��"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "��廬廨 ��� 廬�廢��廬 廣��廨 FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "�� ����廨"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "�廩�廨�廬 ���� ���� �廨�廣"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "廩���廬 廩廨廬 �廬����"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "�廚廡��� �����"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "廩���廬 ��廩� �廡�廢��"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "廩���� ��廩� ���廨��"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "廣廨� CHL 廩��� ��廖廨 �廩廨廬"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "廩廨廬 廣廖�廡"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "廩廨廬 �� ����"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "廩廨廬 �廬廨廣�廬-��廨�� �� 廚�廣�"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "廩���� �����廨 ��廖� ��廬����"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "�廩廨廬 ���� (���� ���廢�)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "廩���� ��廢�廨廬 �����廨"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "廚廨��廨�� �-CVR �� �� ���廨�� �� �廖�廨��"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "�� ��廬� ��廬��"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "�廣��廬 廣� 廬���� 廚廣���"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "��廩廬�廩 廚廣�� ���"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "�廩 ��廬廨 ���� ����廨��."
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "����� �� ���廡"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "廡��廛 ���廨 廩���"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "�� ��� 廢廚��"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "�廩� ������廬� �廩廬�� ��廨 ���"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "�廩廨廬 廣廖�廡 ���"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "�����廬 ��廩�"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "�� ��廬� ��廢廣 �廬 �廚廣��� ��廢� �� �廡���"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "�� �廡�� �廩廬�廩�� ��廩��"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "廚廖廚�廨� ����� ��� �廖��廬 ��廨��"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "�廩��� �廚廖廚�廨� �� ���廬 廣����"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "�廨��廖 �� 廬廡��"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "廡�� 廩���� �� ���廨 %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "廩���廬 MSN: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "�廨�廣 廩��廬 ���廚� 廡��!"
 
-#: src/protocols/msn/msn.c:138
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "�廩� ������廬� ���廩 廩�� �-MSN �廨�� ���."
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "廡�廣/� �廬 廩�� ������廬�."
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "��� �廩� 廩��廬� �廨�� ��廩� �廡廩廨 廩�� �-MSN."
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "廡�廣/� �廬 �廖廚廨 ���廚�� ���廬."
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr ". 廡�廣/� �廬 �廖廚廨 ���廚�� �廣����"
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "廡�廣/� �廬 �廖廚廨 ���廚�� �����."
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "�廚廩廨 ���廣�廬 ����� �-MSN?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6642,29 +7564,29 @@
 "��� �廨廢��� ��廚廩廨 �� �� ��廚廩廨 ���廩�� �廨廩��廬 ��廩� �廡廩廨 廩�� �廩��� �� ���廣�廬 "
 "���廚�� ����� �� 廩�廨 ��廩�廨�� ������?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "�廚廩廨"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "�� 廬�廚廩廨"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "��廬�� ��廩��� �-Hotmail ��� ���� 廚廣��."
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "廩�� �廬�廨 ���廣� �����."
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "�廝"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2886
 #, c-format
 msgid ""
 "\n"
@@ -6673,67 +7595,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "�廩 ��廬�"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3288
 msgid "Be Right Back"
 msgstr "���廨 廣�� 廩���"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3291
+msgid "Busy"
+msgstr "廣廖�廡"
+
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3303
+msgid "On the Phone"
 msgstr "�廩��� ���廚��"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
-msgstr "����"
-
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "��廖廬廨"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "廡�廣/� 廩� �����廬�"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "廡�廣/� �廖廚廨 ��廚�� ���廬"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "廡�廣/� �廖廚廨 ��廚�� �廣����"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "廡�廣/� �廖廚廨 ��廚�� ����"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "�廚廩廨/��� ��廩�廨�� ������"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "�廚廩廨/��� ���廣�廬 ���廩�廨�� ������"
-
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3309
+msgid "Out to Lunch"
+msgstr "�廢� �����"
+
+#: ../src/protocols/msn/msn.c:623
+msgid "Set Friendly Name..."
+msgstr "廡�廣/� 廩� �����廬�..."
+
+#: ../src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "廡�廣/� �廖廚廨 ��廚�� ���廬..."
+
+#: ../src/protocols/msn/msn.c:632
+msgid "Set Work Phone Number..."
+msgstr "廡�廣/� �廖廚廨 ��廚�� �廣����..."
+
+#: ../src/protocols/msn/msn.c:636
+msgid "Set Mobile Phone Number..."
+msgstr "廡�廣/� �廖廚廨 ��廚�� ����..."
+
+#: ../src/protocols/msn/msn.c:642
+msgid "Enable/Disable Mobile Devices..."
+msgstr "�廚廩廨/��� ��廩�廨�� ������..."
+
+#: ../src/protocols/msn/msn.c:647
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "�廚廩廨/��� ���廣�廬 ���廩�廨�� ������..."
+
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
 msgstr "廚廬� �廬 廬��廬 ����廨 廩� Hotmail"
 
-#: src/protocols/msn/msn.c:671
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "廩�� ���廩�廨 ����"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "��_�� 廩���"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:729
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6741,89 +7665,84 @@
 "��廨廩廬 廬���� �-SSL 廣��廨 MSN. �廩 ��廬廡�� 廖廚廨��廬 SSL �廬���. ����廣 ��廖廝 http://"
 "gaim.sf.net/faq-ssl.php"
 
-#: src/protocols/msn/msn.c:745
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "�廩� ��廬��廨�廬 �廩廨廬"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>�����:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1035
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "廚廨�廚�� MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "廩���� �廩��廚廬 �廚廨�廚��"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "���"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "���"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Marital Status"
 msgstr "�廢� �廩廚�廬�"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
 msgid "Location"
 msgstr "��廡��"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "廣�廖�廡"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1607
 msgid "A Little About Me"
 msgstr "廡廢廬 ����廬��"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
 msgid "Favorite Things"
 msgstr "��廨�� ��廣�廚��"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1658
 msgid "Hobbies and Interests"
 msgstr "廬������ �廬���� 廣����"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "廢����"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1681
 msgid "Last Updated"
 msgstr "廣���� ���廨���"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "�廬��廬 �廬廨 ��廬"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1714
 msgid "The user has not created a public profile."
 msgstr "��廩廬�廩 �� �廢廨 廚廨�廚�� 廢���廨�."
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1715
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6832,13 +7751,13 @@
 "MSN ������ 廩�� ���� ��廢�� �廬 廚廨�廚�� ��廩廬�廩. ��廬 ���廨廬 廩��廩廬�廩 �� 廡���, �� "
 "廩��廩廬�廩 廡��� �� �� �廢廨 廚廨�廚�� 廢���廨�."
 
-#: src/protocols/msn/msn.c:1734
+#: ../src/protocols/msn/msn.c:1719
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "���� �� ���� ��廢�� ���廣 �廬�� 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ��廩廬�廩 �� 廡���."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "URL �廚廨�廚��"
 
@@ -6852,76 +7771,85 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:1931 ../src/protocols/msn/msn.c:1933
 msgid "MSN Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:1952
 msgid "Login server"
 msgstr "廩廨廬 ��廬��廨�廬"
 
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:1961
 msgid "Use HTTP Method"
 msgstr "�廩廬�廩 �廩��廬 HTTP"
 
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
+#: ../src/protocols/msn/msn.c:1966
+msgid "Show custom smileys"
+msgstr "�廢� 廖������� 廩��"
+
+#: ../src/protocols/msn/msn.c:1974
+msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: 廩�� ���廚� ���廩 廡廩廨 ��� ��廩�� �廬 廬廩��廬 ����"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "�� ��廬� ��廬��廨"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ���� 廡��廢� 廬廡廚�."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "廩���� �� ���廨廬."
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s 廣� %s (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "��� �廚廩廨�廬 ���廖�廝 �廩廬�廩 廣� %s (%s)"
 
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "��� �廚廩廨�廬 ��廖�� �廩廬�廩 廣� %s (%s)"
 
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "��� �廚廩廨�廬 ��廩廨 �廩廬�廩 廣� %s (%s)"
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "�� ��廬� ���廖�廝 �廬 %s ������ 廩廨廩��廬 ��廩� �廡廩廨 廩�� ����."
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ���� �廩��� 廚廖廚�廨� 廬廡廝."
 
-#: src/protocols/msn/notification.c:815
+#: ../src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "�廩�廨�廬 ���� ���� �廨�廣."
+
+#: ../src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "��� �廚廩廨�廬 �廩��廬 �廬 廩� �廡��廢�"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "��� �廚廩廨�廬 ����廡 �廬 �廡��廢�"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6948,195 +7876,206 @@
 "\n"
 "���廨 廩�廬���廡� ��廩���, 廬���/� ��廬��廨 ���廩."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "廩���� ��廬���"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "廩���� �廡廨���"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "廩���� �� ���廨廬"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: ../src/protocols/msn/servconn.c:144
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"廩���廬 廬廡廩�廨廬 �-%s 廩廨廬 (%s):\n"
+"廩���廬 廬廡廩�廨廬 �廩廨廬 %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "�廚廨���廡�� 廩��� �� �廬�� 廣\"� �廩廨廬."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "廩���� �廚�廣��� HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "�廬� �廬��廨廬 ���廡�� ��廖廝."
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "廩廨廬� �-MSN �� ������ �廨�廣. ��� �廖� ����廨 ��廬廨."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "廩廨廬� �-MSN ����廬 �廚廖�廡�� �廚廣��."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "�� ��廬� ���廬: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� �-MSN ���� ����� �廨�廣. �廩 ��廖�廬 廩��廬 ����廨 ��廬廨."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "���� 廬廡廩�廨廬"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "�廣��廨"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "�廬��� ����廬"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "�廡�� Cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "廩��� Cookie"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "�廡�� 廨廩��廬 ��廩� �廡廩廨"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "�廨��廡 ����廩�"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "�廩��� ���廚��"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "����"
+
+#: ../src/protocols/msn/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "����廣� ���� �� �廩��� ����� 廩���� �廡廢�� ���:"
 
-#: src/protocols/msn/switchboard.c:411
+#: ../src/protocols/msn/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "�� ��廬� �廩��� �廬 ����廣�, �廖�廨 ��廩廨 ��廬�-�廨��:"
 
-#: src/protocols/msn/switchboard.c:415
+#: ../src/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廩廬�廩 �� ����廨:"
 
-#: src/protocols/msn/switchboard.c:419
+#: ../src/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廨廣� 廩���廬 廬廡廩�廨廬:"
 
-#: src/protocols/msn/switchboard.c:423
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��� 廩����� ��廨 ���:"
+
+#: ../src/protocols/msn/switchboard.c:432
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廨廣� 廩���� 廣� ��廨�����:"
 
-#: src/protocols/msn/switchboard.c:431
+#: ../src/protocols/msn/switchboard.c:440
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "����廣� ���� �� �廩��� ������ 廩��廨廣� 廩���� �� ���廨廬:"
 
-#: src/protocols/msn/switchboard.c:952
+#: ../src/protocols/msn/switchboard.c:961
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 廩�� �� �廨�廣 ���廚� 廡��!"
 
-#: src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "��廩廬�廩 %s (%s) 廨�廢� ���廖�廝 %s �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/msn/userlist.c:275
-#, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "%s ��廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��"
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr "%s �廖�廨 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
-
-#: src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+msgid "Authorize"
+msgstr "��廩�廨"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+msgid "Deny"
+msgstr "���"
+
+#: ../src/protocols/msn/userlist.c:286
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ��廖�廚/� ��廬� �廨廩��廬 ��廩� �廡廩廨 廩�� �� 廩��."
+
+#: ../src/protocols/msn/userlist.c:350
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s �廖�廨/� ��廬� �廨廩��廬 ��廩� �廡廩廨 廩�� �� 廩��."
+
+#: ../src/protocols/msn/userlist.c:678
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "��� �廚廩廨�廬 ���廖�廝 \"%s\"."
 
-#: src/protocols/msn/userlist.c:661
+#: ../src/protocols/msn/userlist.c:680
 msgid "The screen name specified is invalid."
 msgstr "�廩� 廩��廬� �廬廢��� ���� ��廡�."
 
-#: src/protocols/napster/napster.c:260
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "�� ��廬� �廡廨�� ��廬廨 ���廣 ��廩廨廬"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "�� ��廬� �廡廨�� ���廣� ��廩廨廬: %s.  廚廡��� ��� %hd, ��廨� ��� %hd."
 
-#: src/protocols/napster/napster.c:290
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
 msgstr "廩���廬 廩廨廬 �� ���廨廬."
 
-#: src/protocols/napster/napster.c:339
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "�廩廬�廩��: %s, 廡�廢��: %s, ����: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "��� �廚廩廨�廬 ���廖�廝 \"%s\" �廨廩��廬 ����� 廩�� ���廚廖�廨"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "��廬廡廬 ��廩廨廬."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s ��廡廩/� �廬 ����廣 廩��"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s ��廡廩 PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "�� ��廬� ��廬��廨"
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_廡��廢�:"
 
@@ -7150,172 +8089,173 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:700
+#: ../src/protocols/napster/napster.c:702
 msgid "NAPSTER Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Napster"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "廚廨��廨�� ���廢�� �� ��廣�廨�"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "�� ��廬� ��廬�� �廨廩廬"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "�� ��廬� �廡廨�� ��廨廩廬"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "廩���� �廬廡廩�廨廬 廣� �廩廨廬"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "�廣��� �� ��廢��"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "�廣��� �� 廡���廬"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "廬�廡�� 廣� 廩� �� ��廨 廡���廬"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "�� �廬�� "
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "廚� 廬�廡廝 廖�廖�廬�"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "廖�廖�� �� 廬廡廚�"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "��廩廬�廩 �� ��廢�"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "��廩��� ����"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "�廩廨廬 �� ��� ��廩廬 �廖廚廨���"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "���� ��廣廨�廬 廩�� ���� 廩���廩 �廚廣��� ��"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "�廩廨廬 �� ����; �廩 ��廖�廬 ����廨 ��廬廨"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "�� ��廬� ���廖�廝 ��廩 廡廩廨 ���廬� 廬�廡��� 廚廣����"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "�� ��廬� ���廖�廝 �廬 廣廢��"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "��廨���� �廨�廩� ����廨 �廢�廨� �� �����"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "廩� ��廩廬�廩 �� �廖�廖�� 廩�����"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "�� ���� �廬 �廩廨廬 廣��廨 ��廩廬�廩 廩����"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "�廩���� ���� 廣廡� 廨���� ���廬 廖�廖���廬 廩����廬"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "�� ��廬� ���廖�廝 廚廣���� �廬 ��廬� ��� �廩���"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "����廬 �廬 ���廖廬 ��廩�-�廡廩廨 廩��廬�� ��"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "���廬 廩� �廩廬�廩 �� 廬廡廝"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "廩���� �廣廬 廣����� �廖廚廨���"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "��廨廖廬 �� 廬���廬 廩� �廚廨���廡��"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "�廩廬�廩 �� �廖� ��廬�"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "��廨廖廬 ���廖�� ��� ���� ��廚廩廨廬 ���廬廨 �-10 �廩廬�廩�� ��廬��廨 �� ����廬"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "�廩廬�廩 �� �� ����廨 �� 廩�廬� �廖��"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "廩���� �� ���廨廬: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�� ��廬� ��廬��廨 (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "�� ��廬� �廩��� ���廣�. �� ��� ��廬� ��廩�� �廬 廚廨�� ��廩廬�廩 廣��廨 (%s)."
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "�� ��廬� �廩��� ���廣� (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "�� ��廬� ������ �廬 ��廩廬�廩 (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "�� ��廬� �廩��� ���廣� �� %s. �� ���� ��廢�廨 �廬 ��廣��� (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "�� ��廬� �廩��� ���廣�. �� ���� ��廢�廨 �廬 ��廣��� (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7324,7 +8264,7 @@
 "�� ��廬� ��廣��廨 �廬 ��廩廬�廩 %s �廬�廡��� %s �廨廩��� �廢� �廩廨廬.廩���� �廣廬 �廢�廨廬 "
 "�廬�廡��� (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7333,67 +8273,67 @@
 "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��.廩���� ��廢�廨廬 廬�廡��� �廨廩��廬 廩� �廩廨廬 "
 "(%s)."
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "�� ��廬� ��廩�� �廬 廚廨�� ��廩廬�廩 %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "�� ��廬� ���廖�廝 �廬 ��廩廬�廩 �廨廩��廬 �廚廨���廬 (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩���� (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "�� ��廬� ���廖�� �廬 %s �廨廩��廬 ����廩廨�� (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "�� ��廬� ��廖�廨 �廬 %s �廨廩��廬 �廚廨���廬 (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "�� ��廬� �廩��廬 �廬 ���廨�廬 �廚廨���廬 �廩廨廬 (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "��� �廚廩廨�廬 ��廢�廨 �廣��� (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "廩���� �廬廡廩�廨廬 廣� �廩廨廬. 廖��廨 �廬 �����廨."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "��廚廨 ��廚��"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "���廡�"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "廩� 廬廚廡��"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "廬��廬 ���廨"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
+#: ../src/protocols/oscar/oscar.c:6120
 msgid "Email Address"
 msgstr "�廬��廬 ���\"�"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "廩� �廩廬�廩"
 
@@ -7404,46 +8344,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "廩� ���"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "�廣��廬 GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "�� ��廬� ��廢廣 ����廨 SSL �廩廨廬."
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "廩���� �廣���� ��廨�廣 �� �廩�� (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "���廬..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "�� ��廬� ��廬��廨 �廩廨廬"
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "��廬�� �廬廩���..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s ����� �廩��� ��."
 
-#: src/protocols/novell/novell.c:1885
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "����� �廩���"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7454,15 +8389,15 @@
 "\n"
 "�廩���: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "��� �廨廢��� ��廢�廨廝 �廩���?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "��廬廡廬 ����� 廩�廬��廨廬 ���廩� ��廨."
 
-#: src/protocols/novell/novell.c:2051
+#: ../src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7472,25 +8407,20 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "�� ��廬� ��廬��廨 �廩廨廬. �廩 ����� �廬 �廬��廬 �廩廨廬 廩�廨廢��� ��廬��廨 ����."
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "廩����. �� ��廬廡�廬 廬���� �-SSL."
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "�廣��� �� �廖�廨�. �� ��廬� �廩��� 廣�� ���廣�廬."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "��� ��廨�� ���廬廡"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7501,272 +8431,272 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3544 ../src/protocols/novell/novell.c:3546
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "廬�廖廝 廬廡廩�廨廬 �-Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3565
 msgid "Server address"
 msgstr "�廬��廬 廩廨廬"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3569
 msgid "Server port"
 msgstr "廚�廨� �廩廨廬"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "�廖廚廨 廩���� �� 廬廡廝."
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "SNAC �� 廬廡廝"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "��廨�� ���廨�"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "��廨�� ��廡��"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "�廩�廨�廬 ���� ����"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:209
 msgid "Service not defined"
 msgstr "廩�廨�廬 ���� ����廨"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:210
 msgid "Obsolete SNAC"
 msgstr "SNAC ���廩�"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "�� �廬�� 廣�-��� �廩廨廬"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "�� �廬�� 廣�-��� ��廡��"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "�����廨 ���� 廣� ��� ��廡��."
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "��廣�� ���� ����"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "���� ��廩����"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:216
 msgid "Request denied"
 msgstr "��廡廩� ����廬"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:217
 msgid "Busted SNAC payload"
 msgstr "���廣 廚��� �-SNAC"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "��� �� �廨廩��廬"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "���廩�廨/廩���� �廡�����"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "�廩��� �廨�廩廣 ���"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "��廡�� �廨�廩廣 ���"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "��廩廬�廩 ���� ���� �廨�廣"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:223
 msgid "No match"
 msgstr "��� �廬���"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:224
 msgid "List overflow"
 msgstr "���廩廬 ������廬 �廨廩���"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "�廡廩� �� �廨�廨�"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "�廬�廨 ���"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "�� ���� 廩��廬 �-AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(���廬� 廬廡�� �廡��廬 ���廣� ��. 廡廨�� ������ 廩�廩 ���-�廩��� 廬���� 廣� �����.)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:638
 msgid "Voice"
 msgstr "廡��"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:641
 msgid "AIM Direct IM"
 msgstr "���廣�廬 �廩�廨�廬 廩� AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "廩���"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
 msgid "Get File"
 msgstr "廡�� 廡��廛"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:654
 msgid "Games"
 msgstr "�廩�廡��"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:657
 msgid "Add-Ins"
 msgstr "廬�廖廚�廬"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:660
 msgid "Send Buddy List"
 msgstr "廩�� 廨廩��廬 ��廩� �廡廩廨"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:663
 msgid "ICQ Direct Connect"
 msgstr "����廨 �廩�廨 廩� ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:666
 msgid "AP User"
 msgstr "AP �廩廬�廩"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:669
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:672
 msgid "Nihilist"
 msgstr "��廚廨 ���廖���廬"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:675
 msgid "ICQ Server Relay"
 msgstr "��廬�� 廩廨廬 ICQ"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:678
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 �廩�"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:681
 msgid "Trillian Encryption"
 msgstr "�廢廚�廬 �廨�����"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:684
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Hiptop"
 msgstr "���廚 廩�廚�廚"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Security Enabled"
 msgstr "����� ��廚廣�廬"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Video Chat"
 msgstr "廩��廬 �����"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:697
 msgid "iChat AV"
 msgstr "iChat ��廨-廡���"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:700
 msgid "Live Video"
 msgstr "廩���廨 ��"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:703
 msgid "Camera"
 msgstr "�廢���"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
 msgid "Free For Chat"
 msgstr "廚��� �廩���"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
 msgid "Not Available"
 msgstr "�� ����"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
 msgid "Occupied"
 msgstr "廣廖�廡"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:731
 msgid "Web Aware"
 msgstr "���廣 廨廩廬"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:735
+msgid "Online"
+msgstr "����廨"
+
+#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
 msgid "Warning Level"
 msgstr "廨�廬 ���廨�"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "�����廬"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:821
 msgid "Buddy Comment"
 msgstr "�廣廨廬 ��廩 廡廩廨"
 
-#: src/protocols/oscar/oscar.c:958
+#: ../src/protocols/oscar/oscar.c:970
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�廬��廨�廬 �廩�廨� 廣� %s �廖�廨�"
 
-#: src/protocols/oscar/oscar.c:960
+#: ../src/protocols/oscar/oscar.c:972
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "廩���� ��廬��廨�廬 �廩�廨� 廣� %s"
 
-#: src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:980
 msgid "Direct Connect failed"
 msgstr "廩���� ��廬��廨�廬 �廩�廨�"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "��廢廣 ����廨 �廩�廨 廣� %s"
 
-#: src/protocols/oscar/oscar.c:1126
+#: ../src/protocols/oscar/oscar.c:1141
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "��廖� ��廬��廨 �� %s �廨� %s:%hu �廬廡廩�廨廬 �廩�廨� ����廣�廬."
 
-#: src/protocols/oscar/oscar.c:1547
+#: ../src/protocols/oscar/oscar.c:1544
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "��廡廩 �-%s ��廬��廨 ����� �� %s:%hu �廬廡廩�廨廬 �廩�廨� ����廣�廬."
 
-#: src/protocols/oscar/oscar.c:1552
+#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
 msgid "Unable to open Direct IM"
 msgstr "�� ��廬� �廚廬�� 廬廡廩�廨廬 �廩�廨� ����廣�廬"
 
-#: src/protocols/oscar/oscar.c:1587
+#: ../src/protocols/oscar/oscar.c:1632
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "��廨廬 �廚廬�� �廬廡廩�廨廬 �廩�廨� ����廣�廬 廣� %s."
 
-#: src/protocols/oscar/oscar.c:1591
+#: ../src/protocols/oscar/oscar.c:1636
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7774,24 +8704,24 @@
 "�廩�� 廩廚廣��� �� ��廩廚廬 �廬 �廬��廬 �-IP 廩��, �廬�� ���� ����� 廖���� �廚廨���廬. "
 "���廩�� ��� ��廬?"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
+#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
+msgid "_Connect"
 msgstr "�廬��廨"
 
-#: src/protocols/oscar/oscar.c:1661
+#: ../src/protocols/oscar/oscar.c:1718
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "����廬 �廬 �廡廩廨 廩�� ���廨 �廢'�� %s."
 
-#: src/protocols/oscar/oscar.c:1684
+#: ../src/protocols/oscar/oscar.c:1741
 msgid "Chat is currently unavailable"
 msgstr "�廩��� ���� ����� �廣廬"
 
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:1813
 msgid "Screen name sent"
 msgstr "�廩�� 廩� ��廩廬�廩"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1829
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7802,73 +8732,78 @@
 "�廩廬�廩�� ������ ��廬 ��廬��� ���廬 ������ 廨廡 ��廬��廬 �廖廚廨�� �廨�����, �� �����廚��, "
 "����� �� �廨廡 �廖廚廨��."
 
-#: src/protocols/oscar/oscar.c:1799
+#: ../src/protocols/oscar/oscar.c:1857
 msgid "Unable to login to AIM"
 msgstr "����廬� ��廬��廨 � AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
 msgid "Could Not Connect"
 msgstr "�� ��廬� ��廬��廨"
 
-#: src/protocols/oscar/oscar.c:1911
+#: ../src/protocols/oscar/oscar.c:1971
 msgid "Connection established, cookie sent"
 msgstr "����廨 ��廩��, �廩�� cookie."
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
+#: ../src/protocols/oscar/oscar.c:2130
 msgid "Attempting connection redirect..."
 msgstr "��廖� ��廬� ���廩 �廬 �����廨..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2176
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
 msgstr ""
 "���� ���廡廢� ��廣�廨廬 �廡��廛 %s ���.\n"
-" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 ����->�廣�廚�廬->AIM/"
-"ICQ."
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 �廩����廬->%s"
+"->廣廨�� �廩���->�廬廡��."
+
+#: ../src/protocols/oscar/oscar.c:2274
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "�� ��廬� ��廨廨 �廬 �廖廚廨 �����廨 �廡��廛."
 
-#: src/protocols/oscar/oscar.c:2211
+#: ../src/protocols/oscar/oscar.c:2279
 msgid "Unable to create new connection."
 msgstr "�� ��廬� ��廢�廨 ����廨 ��廩."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
+#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
 msgid "Unable to log into file transfer proxy."
 msgstr "�� ��廬� ��廬��廨 ���廬 ��� 廩廨廬 廬���� ��廣�廨廬 廡�廢��."
 
-#: src/protocols/oscar/oscar.c:2532
+#: ../src/protocols/oscar/oscar.c:2603
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "�� ��廬� �廡�廣 廩廡廣 廡廩�, �� 廩��� 廬廡廩�廨廬 廣� �廬��� �-AOL."
 
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "廩� �廩廬�廩 �� 廖�廖�� 廩�����"
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:2846
 msgid "Your account is currently suspended."
 msgstr "�廩���� ��廩廣� �廨�廣."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2850
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "廩�廨�廬 ����廣�廬 廩� AOL �� ���� �廨�廣."
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:2855
 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."
@@ -7876,33 +8811,33 @@
 "�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, "
 "廬���廛 ���廬�� �廚��� ��廬廨."
 
-#: src/protocols/oscar/oscar.c:2752
+#: ../src/protocols/oscar/oscar.c:2860
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "��廨廖廬 廬���廬 ��廡�� �� �廬/� �廩廬�廩/廬 �廩�� ���. ��� 廩�廨�/� �-%s"
 
-#: src/protocols/oscar/oscar.c:2783
+#: ../src/protocols/oscar/oscar.c:2888
 msgid "Internal Error"
 msgstr "廩���� 廚����廬"
 
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:2958
 msgid "Received authorization"
 msgstr "�廬廡��� �廨廩��"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:2982
 msgid "The SecurID key entered is invalid."
 msgstr "��廚廬� 廣��廨 SecurID ���� 廬廡廝."
 
-#: src/protocols/oscar/oscar.c:2891
+#: ../src/protocols/oscar/oscar.c:2996
 msgid "Enter SecurID"
 msgstr "�廩 ����� SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:2997
 msgid "Enter the 6 digit number from the digital display."
 msgstr "�廩 ����� �廬 廡�� 6 �廖廚廨�廬 ��廬廢��� ��������廬."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
+#: ../src/protocols/oscar/oscar.c:3158
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7911,24 +8846,24 @@
 "��廬�� �廬��廬廡/� �廡廨��. ���� 廬廨廢/� ���廣�廨 �-TOC 廣� �廩廨 �� �廬�廡�.�廚廩廨 ����廡 �-%"
 "s �廣�������."
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "���� �� �廢��� ��廩�� 廡�� �廬��廨�廬 廬廡廝 廩� AIM."
 
-#: src/protocols/oscar/oscar.c:3054
+#: ../src/protocols/oscar/oscar.c:3161
 msgid "Gaim was unable to get a valid login hash."
 msgstr "���� �� �廢��� ��廩�� 廡�� �廬��廨�廬 廬廡廝."
 
-#: src/protocols/oscar/oscar.c:3085
+#: ../src/protocols/oscar/oscar.c:3182
 msgid "Password sent"
 msgstr "�廖�廖�� �廩���"
 
-#: src/protocols/oscar/oscar.c:4352
+#: ../src/protocols/oscar/oscar.c:4490
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ��廡廩 �廣廬 ��廬��廨 �廩�廨�廬 �� %s"
 
-#: src/protocols/oscar/oscar.c:4355
+#: ../src/protocols/oscar/oscar.c:4493
 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 "
@@ -7937,19 +8872,19 @@
 "�� ��廨廩 ����廨 �廩�廨 ��� 廩�� ���廩���, ����廛 廣��廨 廬����廬 ����廣�廬. ������ 廩�廬��廬 "
 "�-IP 廩�� 廬��廩廝, ��廬�� ��� ���廩� �廖���� �廚廨���廬�."
 
-#: src/protocols/oscar/oscar.c:4394
+#: ../src/protocols/oscar/oscar.c:4532
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "��廡廩�, 廬�/� �� ��廩�廨 ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/oscar/oscar.c:4402
+#: ../src/protocols/oscar/oscar.c:4540
 msgid "Authorization Request Message:"
 msgstr "���廣廬 �廡廩� ��廨廩��:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4541
 msgid "Please authorize me!"
 msgstr "��廡廩�, ��� 廨�廢� �廨廩��!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7958,21 +8893,25 @@
 "��廩廬�廩 %s ��廨廩 �廨廩�� �廚�� 廩�廚廩廨 ���廖�廚� �廨廩��廬 ��廩� �廡廩廨. ��� �廨廢��� �廩��� "
 "�廡廩� �廡��廬 �廨廩��?"
 
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:4576
 msgid "Request Authorization"
 msgstr "�廡廩 �廨廩��"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:4578
+msgid "_Request Authorization"
+msgstr "�廡廩 �廨廩��"
+
+#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
 msgid "No reason given."
 msgstr "�� ��廬�� 廖���."
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:4621
 msgid "Authorization Denied Message:"
 msgstr "���廣廬 廖�廨�� �廨廩��"
 
-#: src/protocols/oscar/oscar.c:4590
+#: ../src/protocols/oscar/oscar.c:4728
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -7981,11 +8920,11 @@
 "��廩廬�廩 %u 廨�廢� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩�� ��廖��� ����:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
 msgid "Authorization Request"
 msgstr "�廡廩廬 �廨廩��"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:4750
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7995,17 +8934,17 @@
 "��廩廬�廩 %u ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��� ��廖��� ����:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: ../src/protocols/oscar/oscar.c:4751
 msgid "ICQ authorization denied."
 msgstr "����廬 �廨廩�廬 ICQ."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:4758
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "��廩廬�廩 %u ��廩廨 �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/oscar/oscar.c:4628
+#: ../src/protocols/oscar/oscar.c:4766
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8018,7 +8957,7 @@
 "��廬: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:4774
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8031,7 +8970,7 @@
 "��廬: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8044,34 +8983,34 @@
 "����廣� ���:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4803
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�廩廬�廩 %u �廚�� ��廬� ���廩 廡廩廨 %s - 廚廨���: %s"
 
-#: src/protocols/oscar/oscar.c:4671
+#: ../src/protocols/oscar/oscar.c:4809
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "��� �廨廢��� ���廖�廝 �廬 ��廩廬�廩 ��� �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
+#: ../src/protocols/oscar/oscar.c:4813
+msgid "_Decline"
 msgstr "���"
 
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:4897
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� ��廬� �� 廬廡��廬."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�� ��� �� 廬廡���廬."
 
-#: src/protocols/oscar/oscar.c:4768
+#: ../src/protocols/oscar/oscar.c:4906
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� ��廬� ����� ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�� ��� �����廬 ���."
 
-#: src/protocols/oscar/oscar.c:4777
+#: ../src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8080,87 +9019,97 @@
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩���廨�廬 �廩���� ��廚廨�廬."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩���廨�廬 �廩���� ��廚廨�廬."
 
-#: src/protocols/oscar/oscar.c:4786
+#: ../src/protocols/oscar/oscar.c:4924
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� 廨廣 ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩��� 廨廣 ���."
 
-#: src/protocols/oscar/oscar.c:4795
+#: ../src/protocols/oscar/oscar.c:4933
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩�廬/� 廨廣 ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�廬/� 廨廣 ���."
 
-#: src/protocols/oscar/oscar.c:4804
+#: ../src/protocols/oscar/oscar.c:4942
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s �廖��� �� ���廣�."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s �廖��� �� ���廣�."
 
-#: src/protocols/oscar/oscar.c:4863
+#: ../src/protocols/oscar/oscar.c:5001
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>�廖廚廨 �����:</B> %s<BR><B>�廢�:</B> %s<HR>%s "
 
-#: src/protocols/oscar/oscar.c:4924
+#: ../src/protocols/oscar/oscar.c:5062
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "���廣廬 廩���� �-SNAC %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:5099
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�� ��廬� �廩��� ���廣�: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
 msgid "Unknown reason."
 msgstr "廖��� �� ���廣�."
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�� ��廬� �廩��� ���廣� � %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: ../src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "User information not available: %s"
 msgstr "���廣 廣� ��廩廬�廩 ���� ����: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "���廣 廣� ��廩廬�廩 %s ���� ����:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: ../src/protocols/oscar/oscar.c:5192
 msgid "Online Since"
 msgstr "����廨 ���"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:5197
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "��廨 ���"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:5202
+msgid "Capabilities"
+msgstr "�����廬"
+
+#: ../src/protocols/oscar/oscar.c:5220
+msgid "Available Message"
+msgstr "���廣廬 �����廬"
+
+#: ../src/protocols/oscar/oscar.c:5337
 msgid "Your AIM connection may be lost."
 msgstr "�����廨 AIM 廩�� ���� �廬�廬廡."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: ../src/protocols/oscar/oscar.c:5523
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[�� ��廬� ��廢�� ���廣� ��廩廬�廩 �� ����� 廩��� ����� 廬���� �� ��廡���.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5744
 msgid "Rate limiting error."
 msgstr "廩���� �����廬 ���廨�廬."
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:5745
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8168,105 +9117,94 @@
 "�廚廣��� ���廨��� 廩��廖�廬 ��廢廣 �� �廬�廢廣� ����� 廩�廬� �廚廨�廬 ����廨�廬 廩���廬 ����廣廬 "
 "�廩 ����廬 10 廩���廬 ���廖�廬 廩��廬."
 
-#: src/protocols/oscar/oscar.c:5631
+#: ../src/protocols/oscar/oscar.c:5818
 msgid "You have been signed off for an unknown reason."
 msgstr "��廬廡廬 �廖��� �� ���廣�."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��廬廡廬 ���廨 �廢'�� %s."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Finalizing connection"
 msgstr "��廢廣 ����廨 �����廨"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "�廖廚廨 �����"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "廚��廚��"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "�廡��"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "��廨"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:6142
 msgid "Personal Web Page"
 msgstr "�廝 ����廨�� ��廩�"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:6146
 msgid "Additional Information"
 msgstr "���廣 ��廖廝"
 
-#: src/protocols/oscar/oscar.c:6004
+#: ../src/protocols/oscar/oscar.c:6151
 msgid "Home Address"
 msgstr "�廬��廬 ���廬"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
 msgid "Zip Code"
 msgstr "��廡��"
 
-#: src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/oscar/oscar.c:6159
 msgid "Work Address"
 msgstr "�廬��廬 �廣����"
 
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6167
 msgid "Work Information"
 msgstr "廚廨�� 廣����"
 
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6168
 msgid "Company"
 msgstr "��廨�"
 
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:6169
 msgid "Division"
 msgstr "���廡�"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:6170
 msgid "Position"
 msgstr "�廩廨�"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "Web Page"
 msgstr "�廝 ����廨��"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Pop-Up Message"
 msgstr "���廣� 廡�廚廢廬"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "廩��廬 ��廩廬�廩�� 廩���� �廡�廩廨�� 廣� %s"
-
-#: src/protocols/oscar/oscar.c:6140
+#: ../src/protocols/oscar/oscar.c:6270
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "廩� ��廩廬�廩 廩���� �廡�廩廨 廣� %s"
+msgstr[1] "廩��廬 ��廩廬�廩�� 廩���� �廡�廩廨�� 廣� %s"
+
+#: ../src/protocols/oscar/oscar.c:6301
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�� ��廢�� 廬�廢��廬 廣��廨 �廬��廬 ����\"� %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/oscar/oscar.c:6322
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "�廩�� ���\"� ��廩廨 �廬 %s."
 
-#: src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Account Confirmation Requested"
 msgstr "�廬廡��� �廡廩� ���廩�廨 ��廩���"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:6355
 msgid "Error Changing Account Info"
 msgstr "廩���� �廩���� ����廣 廩� ��廩���"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8274,19 +9212,19 @@
 msgstr ""
 "廩���� 0x%04x: �� ��廬� �廚廨�� �廬 廩� ��廩廬�廩, ���� 廩廩� ��廩廬�廩 廩��� ��廩� ��廡�廨�."
 
-#: src/protocols/oscar/oscar.c:6200
+#: ../src/protocols/oscar/oscar.c:6361
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "廩���� 0x%04x: �� ��廬� �廚廨�� �廬 廩� ��廩廬�廩, ���� 廩廩� ��廩廬�廩 �� 廬廡��."
 
-#: src/protocols/oscar/oscar.c:6203
+#: ../src/protocols/oscar/oscar.c:6364
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "廩���� 0x%04x: �� ��廬� �廚廨�� �廬 廩� ��廩廬�廩, ���� 廩廩� ��廩廬�廩 �廨�� ���."
 
-#: src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8295,7 +9233,7 @@
 "廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩�廩 ��廨 �廡廩� ���� 廣��廨 "
 "�廩廬�廩 ��."
 
-#: src/protocols/oscar/oscar.c:6209
+#: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8304,7 +9242,7 @@
 "廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩��廬��廬 ��廬��� ����廖廬 "
 "���廬廨 ��� 廩��廬 �廩廬�廩��."
 
-#: src/protocols/oscar/oscar.c:6212
+#: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8312,12 +9250,12 @@
 msgstr ""
 "廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩��廬��廬 廩��廬�� �� ��廡�廬."
 
-#: src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6376
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "廩���� 0x%04x: 廩���� �� ���廨廬."
 
-#: src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:6386
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8326,25 +9264,25 @@
 "廩� ��廩廬�廩 廩�� �廚�廨�� �廨�廣 ��:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
 msgid "Account Info"
 msgstr "���廣 廣� ��廩���"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�廬��廬 ����\"� 廩� %s ��� %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:6464
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "���廣廬-�廬���� �� �廩���. 廣��� ����廬 ����廨/廬 �廬廡廩�廨廬 �廩�廨� �廩��� 廬����廬."
 
-#: src/protocols/oscar/oscar.c:6480
+#: ../src/protocols/oscar/oscar.c:6704
 msgid "Unable to set AIM profile."
 msgstr "��� �廚廩廨�廬 �廡��廣 �廬 廚廨�廚�� �-AIM."
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:6705
 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 "
@@ -8353,7 +9291,7 @@
 "��� ��廨�� ��廖�廬 �廡��廣 �廬 廚廨�廚�� ��廩廬�廩 廩�� �廚�� 廖��� 廬���� �����廬. �廚廨�廚�� "
 "�� �廩廬��; �廩 ��廖�廬 廩��廬 ���廨 廖��� 廬���� �����廬."
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6719
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8366,11 +9304,11 @@
 msgstr[1] ""
 "廣�廨廬 �廬 ��廨� �廚廨�廚�� ��廡廖���� 廩� %d ������. ���� 廡�廢廨 �廬 �廚廨�廚�� 廣��廨�."
 
-#: src/protocols/oscar/oscar.c:6500
+#: ../src/protocols/oscar/oscar.c:6724
 msgid "Profile too long."
 msgstr "�廚廨�廚�� �廨�� ���."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:6766
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8383,24 +9321,11 @@
 msgstr[1] ""
 "廣�廨廬 �廬 ��廨� ���廣廬 �廨���廡 ��廡廖���� 廩� %d ������. ���� 廡�廢廨 ��廬� 廣��廨�."
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:6771
 msgid "Away message too long."
 msgstr "���廣廬 �廨���廡 ����廩� �廨��� ���."
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "�� ��廬� �廡��廣 �廬 ���廣廬 �廨���廡 ����廩� 廩� AIM."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"��廨�� ��廖�廬 �廡��廣 ���廣廬 廨���廡 ����廩� �廚�� 廩�廖廬��� 廬���� ��廬��廨�廬.�廢�� ��廬廨 "
-"\"��廢�\"; �廚廩廨 ��廖�廬 廩�� ��廨� 廩廬���� ����廨�廬 �廖廬����."
-
-#: src/protocols/oscar/oscar.c:6691
+#: ../src/protocols/oscar/oscar.c:6840
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8410,16 +9335,16 @@
 "�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 %s ������ 廩廩� ��廩廬�廩 廩�� �� ��廡�. 廩��廬 �廩廬�廩�� "
 "������ ��廬��� ���廬 ������ 廨廡 ��廬��廬, �廖廚廨�� �廨�����, �� 廨廡 ����� �廖廚廨��."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
+#: ../src/protocols/oscar/oscar.c:7263
 msgid "Unable To Add"
 msgstr "�� ��廬� ���廖�廝"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:6949
 msgid "Unable To Retrieve Buddy List"
 msgstr "�廩��� �廩��廚廬 廨廩��廬 ��廩� �廡廩廨"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:6950
 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 "
@@ -8428,13 +9353,13 @@
 "���� ����廬 �� �廢��� �廩��廝 �廬 廨廩��廬 ��廩� �廡廩廨 廩�� �廩廨廬� AIM. �廨廩��� �� ����, "
 "���� ��廨�� 廬���� ����� �廩廣�廬 �廡廨���廬."
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
+#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
+#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
 msgid "Orphans"
 msgstr "�廬����"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:7247
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8443,11 +9368,11 @@
 "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��, ����� 廩�廩 ��廬廨 ��� ��廩� 廡廩廨 "
 "�廨廩���. �廩 ��廖�廨 ��� ���廖�廬 廩��廬."
 
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
 msgid "(no name)"
 msgstr "(��� 廩�)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7261
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8457,7 +9382,7 @@
 "�� ��廬� ���廖�廝 �廬 %s �廖��� �� ���廣�. �廖��� ��� �廚�廢� ��� 廩��廣廬 ��廖廚廨 ���廨�� "
 "���廬廨 廩� ��廩� 廡廩廨 �廨廩��廬�."
 
-#: src/protocols/oscar/oscar.c:7187
+#: ../src/protocols/oscar/oscar.c:7344
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8465,11 +9390,11 @@
 msgstr ""
 "��廩廬�廩 %s �廬�廨 �� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��. ��� �廨廢��� ���廖�廝 ��廬�?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: ../src/protocols/oscar/oscar.c:7350
 msgid "Authorization Given"
 msgstr "��廨廩�� ��廬��"
 
-#: src/protocols/oscar/oscar.c:7237
+#: ../src/protocols/oscar/oscar.c:7394
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8479,17 +9404,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:7439
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "��廩廬�廩 %s �廬�廨 �� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/oscar/oscar.c:7283
+#: ../src/protocols/oscar/oscar.c:7440
 msgid "Authorization Granted"
 msgstr "��廨廩�� ��廬��"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:7443
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8499,92 +9424,88 @@
 "��廩廬�廩 %s ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩�� ��廖��� ����:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:7444
 msgid "Authorization Denied"
 msgstr "��廨廩�� ����廬"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "���廚�:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Invalid chat name specified."
 msgstr "廩� �廢'�� 廩廢���� ���� 廬廡廝."
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:7587
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "���廣廬 �廬���� �� �廩���. �� ��廬� �廩��� 廬����廬 �廢'���� �-AIM."
 
-#: src/protocols/oscar/oscar.c:7565
-msgid "Away Message"
-msgstr "���廣廬 廨���廡 ����廩�"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:7742
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(廩��廝)</i>"
+
+#: ../src/protocols/oscar/oscar.c:8048
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�廣廨廬 ��廩 廡廩廨 廣��廨 %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:8049
 msgid "Buddy Comment:"
 msgstr "�廣廨廬 ��廩 廡廩廨:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: ../src/protocols/oscar/oscar.c:8068
 msgid "Edit Buddy Comment"
 msgstr "廣廨�� �廣廨廬 ��廩 廡廩廨"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:8075
 msgid "Get Status Msg"
 msgstr "��廨� ���廣廬 �廢�"
 
-#: src/protocols/oscar/oscar.c:7892
+#: ../src/protocols/oscar/oscar.c:8088
 msgid "Direct IM"
 msgstr "廬廡廩�廨廬 �廩�廨� ����廣�廬"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:8107
 msgid "Re-request Authorization"
 msgstr "�廡廩 �廨廩�� 廩��"
 
-#: src/protocols/oscar/oscar.c:7969
+#: ../src/protocols/oscar/oscar.c:8164
 msgid "Require authorization"
 msgstr "�廨�廩 �廨廩��"
 
-#: src/protocols/oscar/oscar.c:7972
-msgid "Hide IP address"
-msgstr "�廖廬廨 �廬��廬 IP"
-
-#: src/protocols/oscar/oscar.c:7975
-msgid "Web aware"
-msgstr "���廣 廨廩廬"
-
-#: src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/oscar/oscar.c:8167
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "���廨-����廨�� (�廚廣�� 廩� �� 廬��� ����廨 廩�� SPAM!)"
+
+#: ../src/protocols/oscar/oscar.c:8172
 msgid "ICQ Privacy Options"
 msgstr "�廚廩廨���廬 廚廨���廬 廩� ICQ"
 
-#: src/protocols/oscar/oscar.c:7997
+#: ../src/protocols/oscar/oscar.c:8189
 msgid "The new formatting is invalid."
 msgstr "�廚�廨�� ���廩 ���� 廬廡��."
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:8190
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "廚�廨��� 廩� 廩� �廩廬�廩 廨廡 ����� �廩��廬 ��廬��廬 �����廬/廡���廬 �廨�����."
 
-#: src/protocols/oscar/oscar.c:8005
+#: ../src/protocols/oscar/oscar.c:8197
 msgid "New screen name formatting:"
 msgstr "廚�廨�� ��廩 �廩� ��廩廬�廩:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: ../src/protocols/oscar/oscar.c:8249
 msgid "Change Address To:"
 msgstr "廩�� �廬��廬 �:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: ../src/protocols/oscar/oscar.c:8294
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>���� ���� ��廨廩��</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:8297
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�廬� ���� ��廨廩�� ���廩� �廡廩廨 ����"
 
-#: src/protocols/oscar/oscar.c:8106
+#: ../src/protocols/oscar/oscar.c:8298
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8592,83 +9513,75 @@
 "�廩 ��廚廩廨�廬� ��廡廩 廩�� �廨廩�� ���廩� 廡廩廨 ��� 廣\"� ���廢� ����廬 廣� �廣��廨 廣���� "
 "�����廨 \"�廡廩 �廨廩�� 廩��\"."
 
-#: src/protocols/oscar/oscar.c:8123
+#: ../src/protocols/oscar/oscar.c:8315
 msgid "Find Buddy by E-mail"
 msgstr "�廢� ��廩 廡廩廨 �廚� ���\"�"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8316
 msgid "Search for a buddy by e-mail address"
 msgstr "�廚廩 ��廩 廡廩廨 �廚� �廬��廬 ����廨 ���廨廡�廨��� 廩��"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:8317
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�廡�� �廬 �廬��廬 ����\"� 廩� ��廩 �廡廩廨 ��廬� �廬� ��廚廩."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:8410
 msgid "Set User Info (URL)..."
 msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩 (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "廩�� 廖�廖��..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:8421
 msgid "Change Password (URL)"
 msgstr "廩�� 廖�廖�� (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:8425
 msgid "Configure IM Forwarding (URL)"
 msgstr "���廨�廬 廣廡��-��廨� ����廣�廬 (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-msgid "Show privacy options..."
-msgstr "�廢� �廚廩廨���廬 廚廨���廬..."
+#: ../src/protocols/oscar/oscar.c:8435
+msgid "Set Privacy Options..."
+msgstr "廡�廣 �廚廩廨���廬 廚廨���廬..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:8442
 msgid "Format Screen Name..."
 msgstr "廚廨�� �廬 廩� ��廩廬�廩..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8446
 msgid "Confirm Account"
 msgstr "�廩廨 �廩���"
 
-#: src/protocols/oscar/oscar.c:8258
+#: ../src/protocols/oscar/oscar.c:8450
 msgid "Display Currently Registered Address"
 msgstr "�廢� �廬 ��廬��廬 �廨廩��� �廨�廣"
 
-#: src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8454
 msgid "Change Currently Registered Address..."
 msgstr "廩�� �廬 ��廬��廬 �廨廩��� �廨�廣"
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:8461
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�廢� �廬 ��廩� �廡廩廨 廩����� ���廩�廨"
 
-#: src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8467
 msgid "Search for Buddy by Email..."
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� �廬��廬 ���\"�..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:8472
 msgid "Search for Buddy by Information"
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� ���廣"
 
-#: src/protocols/oscar/oscar.c:8350
+#: ../src/protocols/oscar/oscar.c:8539
 msgid "Use recent buddies group"
 msgstr "�廩廬�廩 �廡��廢廬 ��廩� 廡廩廨 ��廨���"
 
-#: src/protocols/oscar/oscar.c:8353
+#: ../src/protocols/oscar/oscar.c:8542
 msgid "Show how long you have been idle"
 msgstr "�廢� ��� ��� �廬/� ��� 廚廣���廬"
 
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr "�廩廬�廩 �廩廨廬 �廬���� 廩� AIM/ICQ )��廬廨 ����/������/��\"� 廣���("
+#: ../src/protocols/oscar/oscar.c:8551
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr "�廩廬�廩 �廩廨廬 �廬���� 廩� AIM/ICQ )��廬廨 ����, ��� ��\"� 廣���("
 
 #. *< type
 #. *< ui_requirement
@@ -8680,177 +9593,553 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8684 ../src/protocols/oscar/oscar.c:8686
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡���� Aim/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: ../src/protocols/oscar/oscar.c:8705
 msgid "Auth host"
 msgstr "廩廨廬 �廨廩��"
 
-#: src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:8708
 msgid "Auth port"
 msgstr "�廢��廬 �廨廩��"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:8711 ../src/protocols/zephyr/zephyr.c:2901
 msgid "Encoding"
 msgstr "廡����"
 
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8715
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr 
+"�廩廬�廩 �廩廨廬 �廬���� 廩� AIM/ICQ\n"
+")��廬廨 ����, ��� ��\"� 廣���("
+
+#: ../src/protocols/sametime/sametime.c:415
+msgid "Connection closed (writing)"
+msgstr "�����廨 �廖�廨 (�廬���)"
+
+#: ../src/protocols/sametime/sametime.c:1267
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>廩� 廡��廢�:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1268
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>�廖\"� 廡��廢廬 Notes:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1270
+#, c-format
+msgid "Info for Group %s"
+msgstr "���廣 廣��廨 廡��廢� %s"
+
+#: ../src/protocols/sametime/sametime.c:1272
+msgid "Notes Address Book Information"
+msgstr "���廣 廣� �廬���廬 廩� Notes"
+
+#: ../src/protocols/sametime/sametime.c:1304
+msgid "Invite Group to Conference..."
+msgstr "���� 廡��廢� �廩��廬 �廣���..."
+
+#: ../src/protocols/sametime/sametime.c:1314
+msgid "Get Notes Address Book Info"
+msgstr "廩��廝 ���廣 廣� �廬���廬 廩� Notes"
+
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
 msgstr "廩��� Cookie"
 
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "��廬�� ��廣�廨� ��廬���"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "��廬�� �廬廩��� ��廡廩廬 廬���廬 廬廡廩�廨廬"
+
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "�廬廡��� 廬廩��� ��廡廩廬 廬廡廩�廨廬, 廩��� 廚廨�� ���廖�"
+
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+msgstr "���� �廬廩��� ��廡廩廬 ���廖�"
+
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
-msgstr "廩廨廬 ��廬��廨�廬"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "��廬��廨�廬 ��廚�廬� ���廩"
+
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
-msgstr "���廖"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "���廛 ���廖�"
+
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "�廬��廨 �廩廨廬 �-SILC"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "廚廣��"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣 "
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "�廖�廨 �廩��廬 �-IRC ����� 廨�����"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "廬�廖廝 廚廨���廡�� IRC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "廬�廖廝 廚廨���廡�� IRC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
+msgstr "�廬廡��� 廬廩��� ����廖�"
+
+#: ../src/protocols/sametime/sametime.c:1502
+msgid "Starting Services"
+msgstr "�廚廣�� 廩�廨�廬��"
+
+#: ../src/protocols/sametime/sametime.c:1507
+msgid "Connected"
+msgstr "����廨"
+
+#: ../src/protocols/sametime/sametime.c:1605
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"������廖�廨��廨 Sametime 廩� �廬 ����廣� ���� 廣� �廩廨廬 %s"
+
+#: ../src/protocols/sametime/sametime.c:1610
+msgid "Sametime Administrator Announcement"
+msgstr "���廣� ��廬 ������廖�廨��廨 Sametime"
+
+#: ../src/protocols/sametime/sametime.c:1662
+msgid "Connection reset"
+msgstr "�����廨 ��廬��"
+
+#: ../src/protocols/sametime/sametime.c:1669
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "廩���� �廡廨��廬 �廬���� ��廩廡廣: %s"
+
+#. this is a regular connect, error out
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
+msgid "Unable to connect to host"
+msgstr "�� ��廬� ��廬��廨 �廩廨廬"
+
+#: ../src/protocols/sametime/sametime.c:1736
+#, c-format
+msgid "Announcement from %s"
+msgstr "���廣� ��廬 %s"
+
+#: ../src/protocols/sametime/sametime.c:1910
+msgid "Conference Closed"
+msgstr "��廣��� �廖�廨�."
+
+#: ../src/protocols/sametime/sametime.c:2367
+msgid "Unable to send message: "
+msgstr "�� ��廬� �廩��� ���廣�: "
+
+#: ../src/protocols/sametime/sametime.c:2926
+msgid "Place Closed"
+msgstr "��廡�� �廖�廨"
+
+#: ../src/protocols/sametime/sametime.c:3217
+msgid "Microphone"
+msgstr "��廡廨�廚��"
+
+#: ../src/protocols/sametime/sametime.c:3218
+msgid "Speakers"
+msgstr "廨�廡����"
+
+#: ../src/protocols/sametime/sametime.c:3219
+msgid "Video Camera"
+msgstr "�廢��廬 �����"
+
+#: ../src/protocols/sametime/sametime.c:3223
+msgid "File Transfer"
+msgstr "�廩��� 廡�廢��"
+
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr ""
+"\n"
+"<b>廬��� �:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:3262
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>�廩廬�廩 ��廢���</b>"
+
+#: ../src/protocols/sametime/sametime.c:3368
+msgid "Create conference with user"
+msgstr "廢�廨 廩��廬 �廣��� 廣� ��廩廬�廩"
+
+#: ../src/protocols/sametime/sametime.c:3369
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"�廩 ����� ��廩� 廣��� 廩��廬 ��廣���, ����廣廬 ����� 廩廬�廩�� �� %s"
+
+#: ../src/protocols/sametime/sametime.c:3373
+msgid "New Conference"
+msgstr "�廣��� ��廩�"
+
+#: ../src/protocols/sametime/sametime.c:3375
+msgid "Create"
+msgstr "廢�廨"
+
+#: ../src/protocols/sametime/sametime.c:3439
+msgid "Available Conferences"
+msgstr "�廣���廬 �����廬"
+
+#: ../src/protocols/sametime/sametime.c:3445
+msgid "Create New Conference..."
+msgstr "廢�廨 �廣��� ��廩�..."
+
+#: ../src/protocols/sametime/sametime.c:3452
+msgid "Invite user to a conference"
+msgstr "���� �廩廬�廩 �� �廣���"
+
+#: ../src/protocols/sametime/sametime.c:3453
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"��廨 廩��廬 �廣��� ��廨廩��� ���� �廩��� ����� ��廩廬�廩 %s."
+"��廨 \"廢�廨 �廣��� ��廩�\" �� �廨廢��� ��廢�廨 �廣��� ��廩� ������ ���� �廩廬�廩 ��."
+
+#: ../src/protocols/sametime/sametime.c:3458
+msgid "Invite to Conference"
+msgstr "���� ��廣���"
+
+#: ../src/protocols/sametime/sametime.c:3460
+msgid "Invite"
+msgstr "����"
+
+#: ../src/protocols/sametime/sametime.c:3548
+msgid "Invite to Conference..."
+msgstr "���� ��廣���..."
+
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "廩�� ���廣廬 ��廖���"
+
+#: ../src/protocols/sametime/sametime.c:3600
+msgid "No Sametime Community Server specified"
+msgstr "�� ��廬� 廩廨廬 廡���� 廩� Sametime"
+
+#: ../src/protocols/sametime/sametime.c:3622
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"�� ����廨 廩� �� �廬��廬 IP 廣��廨 �廩��� �-Meanwhile %s. "
+"�廩 ����� ��廬 ���� ��� ���廩�� ����廖� ��廣廨�廬."
+
+#: ../src/protocols/sametime/sametime.c:3627
+msgid "Meanwhile Connection Setup"
+msgstr "���廨�廬 廬廡廩�廨廬 Meanwhile"
+
+#: ../src/protocols/sametime/sametime.c:3628
+msgid "No Sametime Community Server Specified"
+msgstr "�� ����廨 廩廨廬 廡���廬 Sametime"
+
+#: ../src/protocols/sametime/sametime.c:3630
+msgid "Connect"
+msgstr "�廬��廨"
+
+#: ../src/protocols/sametime/sametime.c:4085
+msgid "<b>External User</b><br>"
+msgstr "<b>�廩廬�廩 ��廢���</b><br>"
+
+#: ../src/protocols/sametime/sametime.c:4088
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>���� �廩廬�廩:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4094
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>廩� ���:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4100
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>廬���廬-�廡�� ��廨���:</b> "
+
+#: ../src/protocols/sametime/sametime.c:4108
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "�� ���廣 (0x%04x)<br>"
+
+#: ../src/protocols/sametime/sametime.c:4115
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>廬��� �:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4121
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>�廢�:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5428
+msgid "User Name"
 msgstr "廩� �廩廬�廩"
 
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "�廬���"
-
-#: src/protocols/simple/simple.c:1438
-msgid "Proxy"
-msgstr "�廬���"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5431
+msgid "Sametime ID"
+msgstr "���� Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4291
+msgid "An ambiguous user ID was entered"
+msgstr "廩� �廩廬�廩 ��-�廩�廣� ����"
+
+#: ../src/protocols/sametime/sametime.c:4292
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"����� '%s' ���� ��廬���� �� �� ��� �� ��廩廬�廩�� ����. ��� ��廨/� �廬 ��廩廬�廩"
+"����� �� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../src/protocols/sametime/sametime.c:4297
+msgid "Select User"
+msgstr "��廨 �廩廬�廩"
+
+#: ../src/protocols/sametime/sametime.c:4367
+msgid "Unable to add user: user not found"
+msgstr "��� �廚廩廨�廬 ���廖�廝 �廩廬�廩: ��廩廬�廩 �� ��廢�"
+
+#: ../src/protocols/sametime/sametime.c:4369
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���� �-Sametime 廩��."
+"���� ��廖廨 �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../src/protocols/sametime/sametime.c:4374
+msgid "Unable to add user"
+msgstr "�� ��廬� ���廖�廝 �廩廬�廩"
+
+#: ../src/protocols/sametime/sametime.c:4946
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"廩���� �廡廨��廬 �廡��廛 %s: \n"
+"%s\n"
+
+#: ../src/protocols/sametime/sametime.c:5078
+msgid "Remotely Stored Buddy List"
+msgstr "廨廩��廬 ��廩� �廡廩廨 �����廖�廬 �廨���廡"
+
+#: ../src/protocols/sametime/sametime.c:5083
+msgid "Buddy List Storage Mode"
+msgstr "廢�廨廬 ���廖�� 廨廩��廬 ��廩� �廡廩廨"
+
+#: ../src/protocols/sametime/sametime.c:5086
+msgid "Local Buddy List Only"
+msgstr "廨廩��廬 ��廩� 廡廩廨 �廡���廬 ����"
+
+#: ../src/protocols/sametime/sametime.c:5088
+msgid "Merge List from Server"
+msgstr "��� 廨廩��� �� �廩廨廬"
+
+#: ../src/protocols/sametime/sametime.c:5090
+msgid "Merge and Save List to Server"
+msgstr "��� �廩��廨 廨廩��� �廬�� �廩廨廬"
+
+#: ../src/protocols/sametime/sametime.c:5092
+msgid "Synchronize List with Server"
+msgstr "�廖��廨� 廨廩��� 廣� �廩廨廬"
+
+#: ../src/protocols/sametime/sametime.c:5141
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "���� 廨廩��廬 Sametime 廣��廨 �廩��� %s"
+
+#: ../src/protocols/sametime/sametime.c:5180
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "��廢� 廨廩��廬 Sametime 廣��廨 �廩��� %s"
+
+#: ../src/protocols/sametime/sametime.c:5233
+msgid "Unable to add group: group exists"
+msgstr "�� ��廬� ���廖�廝 廡��廢�: �廡��廢� 廡���廬"
+
+#: ../src/protocols/sametime/sametime.c:5234
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "廡��廢� �廩� '%s' ��廨 廡���廬 �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../src/protocols/sametime/sametime.c:5237
+#: ../src/protocols/sametime/sametime.c:5366
+msgid "Unable to add group"
+msgstr "��� �廚廩廨�廬 ���廖�廝 �廬 �廡��廢�"
+
+#: ../src/protocols/sametime/sametime.c:5296
+msgid "Possible Matches"
+msgstr "�廬���廬 �廚廩廨��廬"
+
+#: ../src/protocols/sametime/sametime.c:5312
+msgid "Notes Address Book group results"
+msgstr "廬�廢��廬 �廬�� 廨廩��廬 ��廬���廬 廩� Notes"
+
+#: ../src/protocols/sametime/sametime.c:5313
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"����� '%s' ���� ��廬���� ��� ��� �廡��廢�廬 廖廚廨� ��廬���廬 廩� Notes 廩����."
+"��� ��廨/� �廬 �廡��廢� ������ �廬�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../src/protocols/sametime/sametime.c:5318
+msgid "Select Notes Address Book"
+msgstr "��廨 廖廚廨 �廬���廬 廩� Notes"
+
+#: ../src/protocols/sametime/sametime.c:5360
+msgid "Unable to add group: group not found"
+msgstr "�� ��廬� ���廖�廝 廡��廢�: �廡��廢� �� ��廢��"
+
+#: ../src/protocols/sametime/sametime.c:5362
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"����� '%s' �� 廬��� ��廝 廡��廢廬 廖廚廨� ��廬���廬 廩� Notes �廡���� 廩��."
+
+#: ../src/protocols/sametime/sametime.c:5403
+msgid "Notes Address Book Group"
+msgstr "廡��廢� �廖廚廨 �廬���廬 廩� Notes"
+
+#: ../src/protocols/sametime/sametime.c:5404
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"�廩 ����� 廩� 廩�廡��廢� �廖廚廨 �廬���廬 廩� Notes �廩�� ���� 廣�-��廬 ���廖�廝 �廬 �廡��廢� "
+"���廨�� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../src/protocols/sametime/sametime.c:5452
+#, c-format
+msgid "Search results for '%s'"
+msgstr "廬�廢��廬 ��廚�廩 廣��廨 %s"
+
+#: ../src/protocols/sametime/sametime.c:5453
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"����� '%s' ���� ��廬���� ��� ��廨 �� ��廩廬�廩�� 廩����. �廩 ��廚廩廨�廬� ���廖�廝 ��廬� "
+"�� 廨廩��廬 ��廩� �廡廩廨 廩�� �� �廩��� ��� ���廣�廬 �廣�廨廬 �廚廬�廨� �廚廣��� 廩����."
+
+#: ../src/protocols/sametime/sametime.c:5485
+msgid "No matches"
+msgstr "�� ��廢�� �廬�����"
+
+#: ../src/protocols/sametime/sametime.c:5486
+#, c-format
+msgid "The identifier '%s' did not match and users in your Sametime community."
+msgstr "����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���廬 �-Sametime 廩��."
+
+#: ../src/protocols/sametime/sametime.c:5490
+msgid "No Matches"
+msgstr "�� ��廢�� �廬�����"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid "Search for a user"
+msgstr "��廚�廩 �廩廬�廩"
+
+#: ../src/protocols/sametime/sametime.c:5528
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"�廩 ����� 廩� �� ���� ��廡� �廩�� ���� ��� ��廚廩 �廩廬�廩�� 廬����� �廡���廬 �-Sametime"
+"廩��."
+
+#: ../src/protocols/sametime/sametime.c:5531
+msgid "User Search"
+msgstr "��廚�廩 �廩廬�廩"
+
+#: ../src/protocols/sametime/sametime.c:5543
+msgid "Import Sametime List..."
+msgstr "���� 廨廩��廬 Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5547
+msgid "Export Sametime List..."
+msgstr "��廢� 廨廩��廬 Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5551
+msgid "Add Notes Address Book Group..."
+msgstr "��廖廝 廡��廢� �廬�� 廖廚廨 �廬���廬 廩� Notes..."
+
+#: ../src/protocols/sametime/sametime.c:5555
+msgid "User Search..."
+msgstr "��廚�廩 �廩廬�廩..."
+
+#: ../src/protocols/sametime/sametime.c:5652
+msgid "Force login (ignore server redirects)"
+msgstr "��廛 ���廖� (�廬廣�� ��廚���廬-廩廨廬)"
+
+#. pretend to be Sametime Connect
+#: ../src/protocols/sametime/sametime.c:5662
+msgid "Hide client identity"
+msgstr "�廖廬廨 ���廬 �廡��"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "��廩廬�廩 %s ���� ��廢� �廨廩廬 �廨�廣"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "�廖��� 廣� �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "�� ���� ��廢廣 �廖��� 廣� �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "�廨廣� 廩���� �廣廬 ��廖��� 廣� �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "��廖��� 廣� �廚廬��廬 ��廩��"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "��� ���� �廡廢�� ��廖�� 廣� �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "��廖��� 廣� �廚廬��廬 �����"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "��廖��� 廣� �廚廬��廬 ��廨 ����"
 
-#: src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "�� ��廬� ��廬��� �廖��� 廣� �廚廬��廬 廣� 廣廢��"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "��廩廬�廩 ��廨��廡 ��廨 �� ���� �廨廩廬"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8858,7 +10147,7 @@
 msgstr ""
 "�廡廩� ��廖��� 廣� �廚廬��廬 �廬廡��� ��廬 %s. ��� �廨廢��� ��廢廣 �廬 ��廖��� 廣� �廚廬��廬?"
 
-#: src/protocols/silc/buddy.c:297
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8869,59 +10158,59 @@
 "�廬��廬 ��廩�: %s\n"
 "�廢���: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "�廡廩� ��廖��� 廣� �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "���廣� �����廬 廣� 廖�廖��"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "�� ���� �廡��廣 �廚廬� ����廣�"
 
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "廡�廣 廖�廖��廬 ���廣�廬"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "�廩� �廚廬� 廢���廨�"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "�� ��廬� ��廩�� �廬 ��廚廬� �廢���廨�"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "�廢� �廚廬� 廢���廨�"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "�� ��廬� ���廣�� �廬 ��廚廬� �廢���廨�"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "���廣 廣� ��廩廬�廩"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "�� ���� ��廩�� �廬 ����廣 廣� ��廩廬�廩"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "��廩 �廡廩廨 %s ���� ����"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8930,16 +10219,16 @@
 "��廬� ��廩廬�廩 �廚廡��廬 �廩� �廚廬� 廢���廨� 廣�-��廬 ��廩�� �廬 ��廚廬� �廢���廨�."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "廚廬�..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "��廩廬�廩 %s �� ���� �廨廩廬"
 
-#: src/protocols/silc/buddy.c:1040
+#: ../src/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8947,15 +10236,15 @@
 "���廖�廝 �廬 ��廩 �廡廩廨, 廣��� ����� �廬 ��廚廬� �廢���廨� 廩��.��廬� ����廛 廣� \"����\" "
 "����� �廚廬� 廢���廨�."
 
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
 msgstr "����..."
 
-#: src/protocols/silc/buddy.c:1130
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "��廨/� �廩廬�廩 ����"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177
 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."
@@ -8963,7 +10252,7 @@
 "��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� �廚廬� 廢���廨�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� "
 "���廖�廝 �廨廩��廬 ��廩� �廡廩廨."
 
-#: src/protocols/silc/buddy.c:1134
+#: ../src/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8971,213 +10260,213 @@
 "��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� 廩�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� ���廖�廝 "
 "�廨廩��廬 ��廩� �廡廩廨."
 
-#: src/protocols/silc/buddy.c:1415
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "���廬廡"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "��廣�廨 ��廬�"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "��廚廨�廡����"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "廨����"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "廩��"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "廣廢��"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "��廣廖"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "�廡��"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "�����廩"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "��廬� ���廢�"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "�����"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "�廩����"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "�廩�廣��"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "���廛"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "�廢�� �廩廬�廩"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "�廢� 廨��"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "�廡廖� �廢�"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "��廩 廡廩廨 ��廣�廝"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "廩廚� ��廣�廚廬"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "��廩�廨"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "����廨 ���"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "��廡��"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "�廬�� �廚廬� ���廣�廬"
 
-#: src/protocols/silc/buddy.c:1572
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "���廣� 廣� ���廚廬 �廚廬��廬"
 
-#: src/protocols/silc/buddy.c:1576
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "���廣� 廣� 廖�廖��"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "�廩� �廚廬� 廢���廨�..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "�廨�� �廩廬�廩"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "廢��廨 廣� ����-����"
+
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_廖�廖��:"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "�廣廨�廛 %s �� 廡��� �廨廩廬"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "���廣 廣� �廣廨�廛"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "�� ���� ��廩�� ���廣 廣� �廣廨�廛"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>廩� �廣廨�廛:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>�廖廚廨 ��廩廬�廩��:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>���廖� �廣廨�廛:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>�廢廚�廬 �廣廨�廛:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC 廩� �廣廨�廛:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>��廩� �廣廨�廛:</b> %s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>�廢� �廣廨�廛:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>��廚廖-�廢�廣 廩� �廚廬� ����廖�:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>��廚廖-廚�廚�廬 廩� �廚廬� ����廖�:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "��廖廝 �廚廬� 廢���廨� �廣廨�廛"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "廚廬� �廚廬� 廢���廨�..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "廖�廖�廬 �廣廨�廛"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "廨廩��廬 ��廚廬��廬 �廢���廨��� 廩� �廣廨�廛"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9190,315 +10479,324 @@
 "�廡�廣� �廚廬��廬 廢���廨��� �廣廨�廛, �� 廨廡 �廩廬�廩�� 廩��廚廬� �廢���廨� 廩��� �廨廩��� ����� "
 "��廢�廨廝."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
+#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "����廬 �廣廨�廛"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "��廖廝 / �廖廨"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "廩� 廡��廢�"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "廖�廖��"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "�廩 ����� �廬 廩� �廡��廢� �廚廨��廬 ��廖�廖�� 廣��廨 �廣廨�廛 %s."
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "��廖廝 廡��廢� 廚廨��廬 �廣廨�廛"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "����廬 �廩廬�廩��"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "�廡��廣廬 ����廬 �廖廚廨 �廩廬�廩��. �廚廖 �廢��� 廩��� �����."
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "�廢� 廚廨���"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "廨廩��廬 �����廬"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "廨廩��廬 �廖����"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "��廖廝 廡��廢� 廚廨��廬"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "�廬�� 廡��廣"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "���廨廬 廡��廣"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "廡��廣廬 ����廬 �廖廚廨 �廩廬�廩��"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "�廬�� ����廬 ��廩�"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "廡��廣廬 ����廬 ��廩�"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "�廬�� 廚廨���廬 廣廨�廛"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "廡��廣廬 廚廨���廬 廣廨�廛"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "�廬�� 廖����廬 廣廨�廛"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "廡��廣廬 廖����廬 廣廨�廛"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1033
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "���� ���廖�/廬 �廣廨�廛 �-<I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:1037
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "���廖�/廬 �廣廨�廛 �<I>%s</I> �� <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../src/protocols/silc/chat.c:1096
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "���� ��廢�廨廝 �廣廨�廛 %s �廚�� �廢�廨廚�廬 �廡��廢� �廚廨��廬"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
 msgstr "�廢�廨廝 �廡��廢� �廚廨��廬"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1099
 msgid "Cannot join private group"
 msgstr "�� ��廬� ��廢�廨廝 �廡��廢� �廚廨��廬"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+msgid "Call Command"
+msgstr "�廢廣 廚廡���"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "�� ���� ��廢廣 廚廡���"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "廚廡��� �� ���廨廬"
 
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "�廩��� 廡�廢�� ������"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../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 "廩���� �廣廬 �廣�廨廬 �廡�廢��"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "��� �廨廩��"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "�廩� �廣廬 �廖��� 廣� �廚廬��廬"
 
-#: src/protocols/silc/ft.c:102
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "廬���� �廣�廨廬 �廡�廢�� �� 廡���"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "��� 廬���� �廣�廨廬 廡�廢�� 廚廣��"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "�廣�廨廬 廡��廛 ��廨 ����"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "�� ��廬� ��廢廣 �廖��� 廣� �廚廬��廬 �廩��� �廣�廨廬 廡�廢��"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "�� ��廬� ��廬��� �廬 �廣�廨廬 �廡��廛"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "�� ��廬� �廩��� �廬 �廡��廛"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 廩��� �廬 ��廩� <I>%s</I> ����廬: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 廩��� �廬 �廢� �廣廨�廛 <I>%s</I> ����廬: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ��廚廖 �廬 �� �廢�� �廣廨�廛 <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 廡�廣 �廬 �廢�� <I>%s</I> ����廬: %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> �廖�廨 �廬 �� �廢�� <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "��廣�廬 �廬�� <I>%s</I> 廣\"� <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "��廨�廬 廣\"� %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "��廨� 廣\"� %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "��廬�廡 廩廨廬"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "���廣 ��廩�"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "��� ����廬"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "廬��廨"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "廬廚廡��"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "��廨���"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "�����"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "���\"�"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "�廣廨�"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "�廢�廨廝 �廢'��"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "�廡廖� �廢�"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "��廚廖-�廢�廣 ��廚廬� 廢���廨�"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "��廚廖-廚�廚�廬 ��廚廬� 廢���廨�"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
 msgstr "廣��..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "��廬廡 �� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "�� ��廬� ����廬廡"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "�� ��廬� �廡��廣 ��廩�"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "�廩� �廩���� ����� ��廩廬�廩"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "廨廩��廬 ��廨��"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "�� ��廬� ��廩�� �廬 廨廩��廬 ���廨��"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "�� �廬廡�� �廚廬� 廢���廨�"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "���廣 廣� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "�� ��廬� ��廩�� ���廣 廣� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "廖���廖��廡�廬 廩� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "�� ���� ��廩�� �廬 �廖���廖��廡�廬 廩� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "��� 廖���廖��廡�廬 �����廬 �廩廨廬"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9533,101 +10831,101 @@
 "廖�\"� �廚廣��� 廩廨廬��: %d\n"
 "廖�\"� �廚廣��� �廬���: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "廖���廖��廡�廬 廩� �廨廩廬"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "廚���"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "廚��� ��廩�"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "�廬廡�� �廣�� �廚��� ��廩廨廬"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "�� ��廬� ��廨�� �廬 ��廩廬�廩"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "廩���� �廣廬 �廬��廨�廬 �廩廨廬 �-SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "���廚廬 ��廚廬��廬 ��廩��"
 
-#: src/protocols/silc/ops.c:1508
+#: ../src/protocols/silc/ops.c:1722
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "��廩� 廬���� 廚廣��� 廩��廬廡, ��廩�. ��廢/� 廣� ����廨 ���廩 ��廢�廨 ����廨 ��廩."
 
-#: src/protocols/silc/ops.c:1543
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "��廬廡 廣\"� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "��廩�� 廬���� 廚廣���"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "���廬 ����廨"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "����� �廚廬� 廢���廨� 廩� �廩廨廬"
 
-#: src/protocols/silc/ops.c:1695
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "��廨廩廬 廖�廖��"
 
-#: src/protocols/silc/ops.c:1724
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "廩����: ��-廬����廬 ��廨廖��廬, �廩 �廩�廨� �廬 廬���� ��廡�� 廩��"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "廩����: �廢� ��廨��廡 �� ����/廬��� ��廚廬� �廢���廨� 廩��"
 
-#: src/protocols/silc/ops.c:1730
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "廩����: �廢� ��廨��廡 �� 廬��� �廡��廢廬 �-KE 廩��廢廣�"
 
-#: src/protocols/silc/ops.c:1733
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "廩����: �廢� ��廨��廡 �� 廬��� ��廢廚�� 廩��廢廣�"
 
-#: src/protocols/silc/ops.c:1736
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "廩����: �廢� ��廨��廡 �� 廬��� �-PKCS 廩��廢廣"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "廩����: �廢� ��廨��廡 �� 廬��� �廚��廡廢��廬 ���廩 廩��廢廣�"
 
-#: src/protocols/silc/ops.c:1742
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "廩����: �廢� ��廨��廡 �� 廬��� �-HMAC 廩��廢廣"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "廩����: �廬��� 廩�����"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "廩����: cookie 廩���"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "廩����: �����廬 ��廩�"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9636,12 +10934,12 @@
 "��廚廬� �廢���廨� 廩� %s �廬廡��. ��廣廬廡 ��廡��� ���� 廬��� ��廚廬� ��. ��� �廨廢��� "
 "���廩�� ��廡�� �廬 ��廚廬� �廢���廨�?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "��廚廬� �廢���廨� 廩� %s �廬廡��. ��� �廨廢��� �廡�� �廚廬� ��?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9654,48 +10952,61 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "���� �廚廬� 廢���廨�"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
+#: ../src/protocols/silc/pk.c:119
+msgid "_View..."
 msgstr "廢廚���..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "廖�� �廚廬� 廢���廨� 廩���� �廬��"
 
-#: src/protocols/silc/silc.c:154
+#: ../src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "��廬��廨�廬 ��廩��"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "�� ��廬� ��廬�� ����廨 �廡�� 廩� SILC"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "��廢廣 ���廚廬 �廚廬��廬"
 
-#: src/protocols/silc/silc.c:270
+#: ../src/protocols/silc/silc.c:283
 msgid "Out of memory"
 msgstr "��� ����廨��"
 
+#: ../src/protocols/silc/silc.c:324
+msgid "Cannot initialize SILC protocol"
+msgstr "�� ��廬� ��廬�� �廬 廚廨���廡�� SILC"
+
+#: ../src/protocols/silc/silc.c:331
+msgid "Cannot find/access ~/.silc directory"
+msgstr "�� ��廬� ��廩廬/��廢�� �廬 廖廚廨��廬 ~/.silc"
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "�廬��廨 �廩廨廬 �-SILC"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:345
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "�� ��廬� ��廣�� �廬 ��� �廚廬��廬 �-SILC: %s"
+
+#: ../src/protocols/silc/silc.c:365
+msgid "Unable to create connection"
+msgstr "�� ��廬� ��廢�廨 ����廨"
+
+#: ../src/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "�廢� �廨�� ������ 廩��"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "廨���"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9703,43 +11014,43 @@
 "\n"
 "廢�廨廬 �廡廩廨 ���廣�廚廬 廣���"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "�廣��廬 �����"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "�廢�� ������"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "廩�廨�廬�� �廡�����"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "�廚廩廨 ���廨�� �廨��廬 ����� 廩�廨�廬 �廬/� �廩廬�廩/廬"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "�廚廩廨 ���廨�� �廨��廬 ����� ��廩� �廬/� �廩廬�廩/廬"
 
-#: src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "廡��廛 �-VCard 廩��"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "��廚���� �廢� �廩廬�廩 ���� �����廨"
 
-#: src/protocols/silc/silc.c:712
+#: ../src/protocols/silc/silc.c:745
 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 "
@@ -9748,148 +11059,189 @@
 "��廬� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 �廬 �廢� �����廨 廩�� ����廣 ��廩�. �廩 ���� �廬 "
 "����廣 廩�廨廢��� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 廣���."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
+#: ../src/protocols/silc/silc.c:1431
 msgid "Message of the Day"
 msgstr "����廣� �����"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "�� 廡���廬 ���廣� �����"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
 msgid "There is no Message of the Day associated with this connection"
 msgstr "��� ���廣� ����� ��廩����廬 �����廨 ��"
 
-#: src/protocols/silc/silc.c:800
+#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+msgid "Create New SILC Key Pair"
+msgstr "廢�廨 ��� �廚廬��廬 SILC ��廩"
+
+#: ../src/protocols/silc/silc.c:837
+msgid "Passphrases do not match"
+msgstr "�廖�廖���廬 ���� 廬����廬."
+
+#: ../src/protocols/silc/silc.c:881
+msgid "Key Pair Generation failed"
+msgstr "�廩� �廣廬 �廢�廨� 廩� ��� �廚廬��廬"
+
+#: ../src/protocols/silc/silc.c:920
+msgid "Key Length"
+msgstr "��廨� �廚廬�"
+
+#: ../src/protocols/silc/silc.c:922
+msgid "Public Key File"
+msgstr "廡��廛 �廚廬� 廢���廨�"
+
+#: ../src/protocols/silc/silc.c:924
+msgid "Private Key File"
+msgstr "廡��廛 �廚廬� 廚廨��"
+
+#: ../src/protocols/silc/silc.c:933
+msgid "Real Name"
+msgstr "廩� ���廬�"
+
+#: ../src/protocols/silc/silc.c:947
+msgid "Re-type Passphrase"
+msgstr "廨廩�� 廖�廖�� �廩��廬"
+
+#: ../src/protocols/silc/silc.c:954
+msgid "Generate Key Pair"
+msgstr "廢�廨 ��� �廚廬��廬"
+
+#: ../src/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "�����廬"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "�廢� �廬 ���廣廬 ����"
 
-#: src/protocols/silc/silc.c:882
+#: ../src/protocols/silc/silc.c:1011
+msgid "Create SILC Key Pair..."
+msgstr "廢�廨 ��� �廚廬��廬 SILC..."
+
+#: ../src/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "��廬廩�廩 <I>%s</I> ���� ���� �廨廩廬"
 
-#: src/protocols/silc/silc.c:1033
+#: ../src/protocols/silc/silc.c:1302
 msgid "Topic too long"
 msgstr "���廩� �廨�� ���"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1383
 msgid "You must specify a nick"
 msgstr "���� �廢��� ����� �廩廬�廩"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel %s not found"
 msgstr "�廣廨�廛 %s �� ��廢�"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1490
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "�廢�� 廣廨�廛 %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1492
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "��� �廢��� 廩�廡�廣� 廣� �廣廨�廛 %s"
 
-#: src/protocols/silc/silc.c:1236
+#: ../src/protocols/silc/silc.c:1505
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "�廩� �廡��廣廬 �廢�� 廣廨�廛 廣��廨 %s"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1535
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "廚廡��� �� ���廨廬: %s, )��廬�� ���� ��� �����("
 
-#: src/protocols/silc/silc.c:1329
+#: ../src/protocols/silc/silc.c:1598
 msgid "part [channel]:  Leave the chat"
 msgstr "part [廣廨�廛]: 廣��� �廬 �廣廨�廛 "
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1602
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [廣廨�廛]: 廣��� �廬 �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1606
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;��廩� ��廩&gt;]: �廢� �� 廩�� �廬 ���廩� "
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1611
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;廣廨�廛&gt; [&lt;廖�廖��&gt;]:  �廢�廨廝 �廣廨�廛 �廨廩廬 ��"
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1615
 msgid "list:  List channels on this network"
 msgstr "list:  �廢� �廬 廨廩��廬 �廣廨�廢�� �廨廩廬 ��"
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1619
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;����� �廩廬�廩&gt;:  廢廚� ����廣 ����廬 ��廩廬�廩"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;����� �廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩"
 
-#: src/protocols/silc/silc.c:1358
+#: ../src/protocols/silc/silc.c:1627
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;����� �廩廬�廩&gt; [&lt;���廣�&gt;]:  廩�� ���廣� 廚廨��廬 ��廩廬�廩"
 
-#: src/protocols/silc/silc.c:1362
+#: ../src/protocols/silc/silc.c:1631
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  廢廚� ����廣廬 ���� 廩� �廩廨廬"
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1635
 msgid "detach:  Detach this session"
 msgstr "detach:  �廬廡 廬���� 廚廣���廬 �� ��廩廨廬"
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1639
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [���廣�]:  ��廬�廡 �� �廩廨廬, 廣� �廚廩廨�廬 ����廣�"
 
-#: src/protocols/silc/silc.c:1374
+#: ../src/protocols/silc/silc.c:1643
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;廚廡���&gt;:  廡廨� �廚廡��廬 �廡�� ��廩�� 廩� silc"
 
-#: src/protocols/silc/silc.c:1380
+#: ../src/protocols/silc/silc.c:1649
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;廩� �����&gt; [-pubkey|&lt;廖���&gt;]:  �廨�� �廩廬�廩"
 
-#: src/protocols/silc/silc.c:1384
+#: ../src/protocols/silc/silc.c:1653
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;廩� ����� ��廩&gt;:  廩���� ������ 廩��"
 
-#: src/protocols/silc/silc.c:1388
+#: ../src/protocols/silc/silc.c:1657
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;廩� �����&gt;:  �廢� ���廣 廣� �廩廬�廩"
 
-#: src/protocols/silc/silc.c:1392
+#: ../src/protocols/silc/silc.c:1661
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 "cmode &lt;廣廨�廛&gt; [+|-&lt;�廢���&gt;] [廚廨��廨��]: 廩�� �� �廢� �廬 �廢�� �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1396
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;廣廨�廛&gt; +|-&lt;�廢���&gt; &lt;廩� �����&gt;:  廩�� �廢�� �廩廬�廩 �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1400
+#: ../src/protocols/silc/silc.c:1669
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;�廢�� �廩廬�廩&gt;:  廡��廣廬 �廢�� ��廩廬�廩 廩�� �廨廩廬"
 
-#: src/protocols/silc/silc.c:1404
+#: ../src/protocols/silc/silc.c:1673
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;廩� �����&gt; [-pubkey]:  �廩� �廨廩��廬 �廚廣�� 廩廨廬"
 
-#: src/protocols/silc/silc.c:1408
+#: ../src/protocols/silc/silc.c:1677
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9897,35 +11249,35 @@
 "invite &lt;廣廨�廛&gt; [-|+]&lt;廩� �����&gt;:  ���� �廩廬�廩 �� ��廖廝/�廖廨 �廨廩��廬 "
 "������廬 廩� �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1412
+#: ../src/protocols/silc/silc.c:1681
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;廣廨�廛&gt; &lt;廩� �����&gt; [�廣廨�]:  �廣� �廩廬�廩 �� �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:1685
 msgid "info [server]:  View server administrative details"
 msgstr "info [廩廨廬]:  �廢� ���廣 廬廚廣��� 廣� �廩廨廬"
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1689
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;廣廨�廛&gt; +|-&lt;廩� �����&gt;]:  �廖�� �廩廬�廩 �� �廣廨�廛"
 
-#: src/protocols/silc/silc.c:1424
+#: ../src/protocols/silc/silc.c:1693
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;廩�� �����|廩廨廬&gt;:  �廩� �廚廬� 廢���廨� 廩� 廩廨廬 �� �廩廬�廩"
 
-#: src/protocols/silc/silc.c:1428
+#: ../src/protocols/silc/silc.c:1697
 msgid "stats:  View server and network statistics"
 msgstr "stats:  �廢� ���廣 廖���廖�� 廣� �廩廨廬 ��廨廩廬"
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1701
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  廩�� PING �廩廨廬 �����廨"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1706
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;廣廨�廛&gt;:  �廢� �廬 廨廩��廬 �廣廨�廢��"
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1710
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9933,30 +11285,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;廣廨�廢(��)&gt;:  �廢� 廨廩��廬 "
 "��廩�� �廖�� �廖���� �廣廨�廢(��)"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "�廖廨�� ������"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "�������廬 �廬�� �������廬 廣� �� ����廣�廬"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "���� �廬���廬 廣� �� ����廣�廬 �������廬"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "���廣�廬 ��廨"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "�廬�� �������廬 廣� �� ����廣�廬 ���廨"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "���� �廬���廬 廣� �� ����廣�廬 ���廨"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9966,91 +11294,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� IRC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "廚廨���廡�� 廬廡廩�廨廬 ����-��廬 ������廬(SILC)"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr "廡��廛 �廚廬� 廢���廨�"
 
-#: src/protocols/silc/silc.c:1604
+#: ../src/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr "廡��廛 �廚廬� 廚廨��"
 
-#: src/protocols/silc/silc.c:1607
+#: ../src/protocols/silc/silc.c:1873
+msgid "Cipher"
+msgstr "廢�廚�"
+
+#: ../src/protocols/silc/silc.c:1883
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../src/protocols/silc/silc.c:1886
 msgid "Public key authentication"
 msgstr "����廬 廣廚\"� �廚廬� 廢���廨�"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
 msgstr "廖廨� 廢廚��� 廣\"� �廩廬�廩�� ��廨��"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1892
 msgid "Block invites"
 msgstr "�廖�� �����廬"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
 msgstr "�廖�� ���廣�廬 �����廬 ��� ���廚廬 �廚廬��廬"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
 msgstr "廖廨� ��廡廩�廬 �廢� ����廨"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1901
+msgid "Block messages to whiteboard"
+msgstr "�廖�� ���廣�廬 ����-����"
+
+#: ../src/protocols/silc/silc.c:1904
+msgid "Automatically open whiteboard"
+msgstr "廚廬� ���-��� �������廬"
+
+#: ../src/protocols/silc/silc.c:1907
+msgid "Digitally sign and verify all messages"
+msgstr "�廬�� �������廬 ���� �廬 �� ����廣�廬 �������廬 "
+
+#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "��廢廨 ��� �廚廬��廬 SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: ../src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "廩� ���廬�: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "廩� �廩廬�廩: \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "���\"�: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "廩� 廩廨廬: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "廩� ���廨���: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "�����: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "����廨�廬�: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "��廨� �廚廬�: \t%d �����\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10061,7 +11409,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10070,140 +11418,225 @@
 "��廚廖-廚�廚�廬 ��廚廬� �廢���廨�:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "���廣 廣� ��廚廬� �廢���廨�"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "��廚�廝"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "��廩�"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "��廩� �廝-��"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "�廖�廝"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s 廩�� ���廣� �� ���� ����. ��� �廨廢��� �廚廬�� �廬 ���� ����?"
+
+#: ../src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s 廩�� ���廣� �� ���� ���� �廣廨�廛 %s."
+"��� �廨廢��� �廚廬�� �廬 ���� ����?"
+
+#: ../src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "���-���"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:415
+msgid "Could not write"
+msgstr "�� ��廬� ��廬��"
+
+#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+msgid "Could not connect"
+msgstr "�� ��廬� ��廬��廨"
+
+#: ../src/protocols/simple/simple.c:924
+msgid "Wrong Password"
+msgstr "廖�廖�� 廩����"
+
+#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
+#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
+msgid "Could not create listen socket"
+msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣-廡廩�"
+
+#: ../src/protocols/simple/simple.c:1383
+msgid "Couldn't resolve host"
+msgstr "�� ��廬� ��廢�� �廬��廬 廩廨廬"
+
+#: ../src/protocols/simple/simple.c:1481
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "�廖�廨 �廩��廬 �廩廬�廩�� 廩� SIP ����� 廨����� �� 廖��� @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1643
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "廬�廖廝 廚廨���廡�� SIP/SIMPLE"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1644
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "廬�廖廝 �廚廨���廡�� SIP/SIMPLE"
+
+#: ../src/protocols/simple/simple.c:1666
+msgid "Publish status (note: everyone may watch you)"
+msgstr "��廢� 廖���廖 (�廣廨�: ���� ����� �廢廚�廬 ��)"
+
+#: ../src/protocols/simple/simple.c:1672
+msgid "Use UDP"
+msgstr "�廩廬�廩 �-UDP"
+
+#: ../src/protocols/simple/simple.c:1674
+msgid "Use proxy"
+msgstr "�廩廬�廩 ��廬���"
+
+#: ../src/protocols/simple/simple.c:1676
+msgid "Proxy"
+msgstr "�廬���"
+
+#: ../src/protocols/simple/simple.c:1678
+msgid "Auth User"
+msgstr "�廩廬�廩 �����廬"
+
+#: ../src/protocols/simple/simple.c:1680
+msgid "Auth Domain"
+msgstr "������ �����廬"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "��廚廩 �廬 %s..."
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "��廬��廨�廬 �� %s �� �廢����."
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "�廬��廨: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "��� �廚廩廨�廬 ��廬�� �� �廡��廛 %s"
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廡��廛 %s."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "���廣� �廨��� ���, %s ������� ���廨���� �廡���."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ���� ����廨 �廨�廣."
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "���廨� 廩� %s  ���� ��廬廨廬."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "���� ���廣�; �廬� 廣��廨 廣� ����廬 ����廨�廬 廩� �廩廨廬."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "廢'�� �-%s ���� ����."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "�廬� 廩��� ���廣�廬 �� %s ��廨 ����."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "廚廖廚廖廬 ���廣� �-%s ����� 廩��� ���廬� �廨��� ���."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "廚廖廚廖廬 ���廣� �-%s ����� 廩��� �廩��� ��廨 ���."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "��廩���."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "��廬廨 ���� 廬�廢��廬"
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "���廚�廩 �廡�廡 ���廬廨 ����廨��."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "廩�廨�廬 ���廨�� ���� ���� ����廬."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "��廚�廩 ����\"� �����."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "�廬廣�� ����廬 ��廚廬�."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "��� ����廬 �廚廬�."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "��� ���廣 廣��廨 �廩廬�廩 ��"
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "������ ���� �廬��廬."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "�廩� ���廨: %s"
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "�廩�廨�廬 ���� ���� ����廬."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "廨�廬 ����廨� 廩�� ����� ���� �廨�廣 ���� �����廖 ��廣廨�廬."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -10211,41 +11644,41 @@
 "�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, "
 "廬���廛 ���廬�� �廚��� ��廬廨."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�廨廣� 廩���� �� ���廣� ���� ��廖��� �廚廬��廬 %s"
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "�廨廣� 廩���� �� ���廨廬, %d, ���廣: %s"
 
-#: src/protocols/toc/toc.c:584
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
 msgstr "廩� �廡��廢� 廩���"
 
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "�����廨 �廖�廨."
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "��廬�� �廬廩���..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ��廨 �� �-pause 廩��. ��廬� �廩��� ���廣�廬 廩��."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���."
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 廩�� 廚廡��廬 PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10254,44 +11687,52 @@
 "��廩廨 �� 廡�廨�, TOC �廬廣�� ��� ���廣� 廩�廩��廬 ����, ���廬�� ��廝 ��廣� ��廬� ���廢� �� "
 "廬廩�� ���廣�. ���� ���廣 ���� �廣��廨. �� 廨廡 ����, �� ����廩廨 �廖����廬."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "�廩� ���廣 廣� ��廩廬�廩"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "���廣 ���� 廣� ��廩廬�廩"
+
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "廡�廣 ���廣 廣� ��廩廬�廩"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "廩�� 廖�廖��"
+
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�� ��廬� �廚廬�� %s ��廬���"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "�廩� ��廣�廨廬 �廡��廛, ��廨�� 廢� 廩�� ����"
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "�� ��廬� ���廨 �廬 ��廣�廨�."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�� ��廬� ��廬�� �廬 廨�廩廬 �廡��廛. �廡��廛 �� ��廣�廨."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "���� �� 廩��廨 �廩�..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, 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"
 msgstr[1] "%s ��廡廩 �-%s �廡�� %d 廡�廢��: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ��廡廩/廬 ��� �廩��� ��/�� 廡��廛"
@@ -10306,27 +11747,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2320 ../src/protocols/toc/toc.c:2322
 msgid "TOC Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2341
 msgid "TOC host"
 msgstr "廩廨廬 TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2345
 msgid "TOC port"
 msgstr "�廢��廬 TOC"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "���廣廬 � Yahoo 廩�� �� �廩���."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
 msgid "Buzz!!"
 msgstr "����!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: ../src/protocols/yahoo/yahoo.c:810
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "���廣廬 �廣廨�廬 廣��廨 %s �-Yahoo!:"
@@ -10334,21 +11775,21 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: ../src/protocols/yahoo/yahoo.c:906
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "��廩廬�廩 %s 廨�廢� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��%s%s."
 
-#: src/protocols/yahoo/yahoo.c:893
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Message (optional) :"
 msgstr "���廣� (�� ����) :"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: ../src/protocols/yahoo/yahoo.c:954
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s )廨�廨��廡����廬( ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: src/protocols/yahoo/yahoo.c:938
+#: ../src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10357,11 +11798,11 @@
 "%s )廨�廨��廡����廬( ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��. ��廖��� ����: "
 "%s."
 
-#: src/protocols/yahoo/yahoo.c:941
+#: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
 msgstr "��廖廚廬 ��廩 廡廩廨 ���廬�"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1703
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10371,11 +11812,11 @@
 "廩廨廬 �-Yahoo ��廡廩 廬廢�廨廬 ����廬 �� ���廨廬. ��廨廖� �� 廩� ���� 廡廨�� ������ �� 廬��� "
 "��廬��廨 ��廢��� �-Yahoo. ���廡 �-%s �廣�������."
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
 msgstr "��廩��� �����廬 ��� Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10384,19 +11825,19 @@
 "��廖�廬 ��廬廣�� �-%s, �� �廩廬�廩 �� ��廢� �廨廩��廬 ��廩� �廡廩廨 廩��. ���廢� 廣� \"��\" "
 "廬廖�廨 �廬廬廣�� �� ��廩廬�廩."
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "�廬廣�� ��廩廬�廩?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "廩� ��廩廬�廩 廩���."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "����廬 廨��� ��廩�!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10407,123 +11848,136 @@
 "�廩廬�廬�. ���� ��廖� �����廖 �廣�廨廬 ����廬 廩� Web Messanger, �廩廨 ��廚廩廨 廨廡 �����廬 "
 "������廬 廩� �廚廨���廡��."
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "廖�廖�� �� �����."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "�廩���� �廣��, �廩 ��廩廬 ��廬廨 廩� Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "廩���� �� ���廨廬 �廖廚廨 %d. �廬��廨�廬 ��廬廨 Yahoo! ���� �廬廡� �廬 ��."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 %s �廡��廢� %s �廨廩��� 廣� �廩廨廬 ��廩��� %s."
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 �廨廩��� �廩廨廬"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2011
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ �廨-廩��廣� %s/%s/%s.swf ] %s"
+
+#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "�� ��廬� �廡廨��"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "廬廡�廬 廬廡廩�廨廬"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3294
+msgid "Not at Home"
 msgstr "�� ��廢� ���廬"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3297
+msgid "Not at Desk"
 msgstr "�� ��� �廩����"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3300
+msgid "Not in Office"
 msgstr "�� ��廢� ��廩廨�"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
 msgid "On Vacation"
 msgstr "���廚廩�"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
 msgid "Stepped Out"
 msgstr "�廢� �廨�廣"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
 msgid "Not on server list"
 msgstr "�� �廨廩��廬 �廩廨廬��"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
 msgid "Appear Online"
 msgstr "�廨�� ����廨"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
 msgid "Appear Permanently Offline"
 msgstr "�廨�� ���廬廡 �廣�"
 
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "�廖廬廨"
-
-#: src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2887
+msgid "Presence"
+msgstr "�����廬"
+
+#: ../src/protocols/yahoo/yahoo.c:2930
+msgid "Appear Offline"
+msgstr "��� ��廨�� ���廬廡"
+
+#: ../src/protocols/yahoo/yahoo.c:2939
 msgid "Don't Appear Permanently Offline"
 msgstr "�� 廬�廨�� ���廬廡 �廣�"
 
-#: src/protocols/yahoo/yahoo.c:2896
+#: ../src/protocols/yahoo/yahoo.c:2987
 msgid "Join in Chat"
 msgstr "�廢�廨廝 �廩���"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2993
 msgid "Initiate Conference"
 msgstr "���� �廣���"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "�廚廩廨���廬 �廖廬廨�"
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:3021
+msgid "Presence Settings"
+msgstr "�廚廩廨���廬 �����廬"
+
+#: ../src/protocols/yahoo/yahoo.c:3027
 msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2963
+msgstr "�廬�� �廡廩廡廩"
+
+#: ../src/protocols/yahoo/yahoo.c:3059
 msgid "Active which ID?"
 msgstr "���� ID ��廚廣��?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3068
 msgid "Join who in chat?"
 msgstr "��廢�廨廝 ��� �廢'��?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3078
 msgid "Activate ID..."
 msgstr "�廚廣� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "�廢�廨� ��廩廬�廩 �廢'��..."
-
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3082
+msgid "Join User in Chat..."
+msgstr "�廢�廨廝 ��廩廬�廩 �廢'��..."
+
+#: ../src/protocols/yahoo/yahoo.c:3620
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;��廨&gt;:  �廢�廨廝 ���廨 廢'�� �廨廩廬 Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: 廩�� ������ ���廩 廡廩廨 ��� ��廩�� �廬 廬廩��廬 ����"
-
-#: src/protocols/yahoo/yahoo.c:3550
+#: ../src/protocols/yahoo/yahoo.c:3625
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: �廢� �廬 廨廩��廬 ���廨�� �廨廩廬 Yahoo"
+
+#: ../src/protocols/yahoo/yahoo.c:3629
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 廩�� ������ ��廩廬�廩 ��� ��廩�� �廬 廬廩��廬 ����"
+
+#: ../src/protocols/yahoo/yahoo.c:3633
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: ��廡廩 ���廩廬�廩 ��廬��� �- Doodle"
 
 #. *< type
 #. *< ui_requirement
@@ -10535,126 +11989,137 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3746
 msgid "Yahoo Japan"
 msgstr "Yahoo �廚�"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: ../src/protocols/yahoo/yahoo.c:3749
 msgid "Pager host"
 msgstr "廩廨廬 �-Pager"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: ../src/protocols/yahoo/yahoo.c:3752
 msgid "Japan Pager host"
 msgstr "廩廨廬 �-Pager ��廚�"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3755
 msgid "Pager port"
 msgstr "�廢��廬 Pager"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3758
 msgid "File transfer host"
 msgstr "廩廨廬 ��廣�廨廬 廡�廢��"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3761
+msgid "Japan file transfer host"
 msgstr "廩廨廬 �廚�� ��廣�廨廬 廡�廢��"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3764
 msgid "File transfer port"
 msgstr "�廢��� ��廣�廨廬 廡�廢��"
 
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: ../src/protocols/yahoo/yahoo.c:3767
+msgid "Chat room locale"
 msgstr "���廨� ����廨�廬 ���廨 廢'��"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: ../src/protocols/yahoo/yahoo.c:3770
+msgid "Ignore conference and chatroom invitations"
+msgstr "�廬廣�� ������廬 �廩���廬-�廣��� ����廨�-廢'��"
+
+#: ../src/protocols/yahoo/yahoo.c:3774
+msgid "Chat room list URL"
 msgstr "��廡�� 廩� 廨廩��廬 ��廨� �廢'��"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: ../src/protocols/yahoo/yahoo.c:3777
+msgid "YCHT host"
 msgstr "廩廨廬 YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: ../src/protocols/yahoo/yahoo.c:3780
+msgid "YCHT port"
 msgstr "�廢��� �-YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "廩���� ��廬���"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>�廬��廬 IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "廚廨�廚�� Yahoo! �廚�"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "廚廨�廚�� Yahoo! "
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "廖����, �� 廚廨�廚���� ��廖����� ������� ���廣 �����廨�� ���� �� �廬���� �廨�廣."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "�� �廨廢��� �廨��廬 廚廨�廚�� ��, �廩 ��廩廬�廩 �廡�廩�廨 ��� ��廚�廚� �����廨�� 廩��."
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 msgid "Yahoo! ID"
 msgstr "����� Yahoo"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
 msgstr "廬������"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "��廨���廬 ��廩�廬"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "�廝 ���廬"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "廡�廩�廨 ����� 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "廡�廩�廨 ����� 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "廡�廩�廨 ����� 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
 msgstr "廣���� ���廨���"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "廚廨�� ��廩廬�廩 %s���� ������ "
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr "廖����, �� �廨�� �� 廚廨�廚�� �� ��� �廩廚� 廩�� �廬��廬 �廨�廣."
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"廖����, �� �廨�� �� 廚廨�廚�� �� ��� �廩廚� �� 廚�廨�� "
+"廩�� �廬���� �廨�廣."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10662,7 +12127,7 @@
 "�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ���� 廬廡�� ����廬 �廩廨廬. �廩 ��廖�廬 "
 "廩��廬 ����廨 ��廬廨."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10672,147 +12137,168 @@
 "�廣�廬�� Yahoo! �� �廢��� ��廢�� 廚廨�廚�� �廩廬�廩. �� �廬/� ����/� 廩��廩廬�廩 廡���, �廖/� "
 "廩��廬 ����廨 ��廬廨."
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
 msgstr "廚廨�廚�� ��廩廬�廩 廨�廡."
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 廖廨� �廬 ������ 廩�� ��廣��� ���廨 \"%s\" ����� 廩-\"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "������ ���廬�"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "�� ��廬� ��廢�廨廝 �廩���"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "���� ����廬 廩���廨 ���?"
-
-#: src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "��廨 �� ���廨"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "���� ���廨 ���"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "�� ����"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"廩���� �� ���廨廬. 廣��� ��廬�廬廡 �����廬 ���廩 �廡�廬 �廚�� 廩���� �廚廩廨 "
+"��廢�廨廝 廩�� ���廨-廢'��"
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "�廬/� �廣廬 �廢'�� 廣� %s."
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "��廩��� ��廢�廨廚�廬 ���廩 廡廩廨 �廢'��"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "���� �� �� �廬�� 廢'��?"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "廩���� �廡��廬 廨廩��廬 ���廨��."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "廡���廬"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "�廢���廬 ����廨��"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "�� ��廬� �廡�� 廨廩��廬 ���廨��."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "��廨�� 廩� �廩廬�廩��"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "廩���� �廬廡廩�廨廬 廣� 廩廨廬 �-YCHT."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(���廬� 廩���� ���廨廬 ����廣�.\t ���廡 �廬 ���廨�廬 �'廡����' �廣�廨� ��廩����廬)"
 
-#: src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "�� ��廬� �廩��� �廢'�� %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>�廩廬�廩:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>���� �� �� ����廨"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>�-%s ��� %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "�� ���"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2278
 msgid "_Class:"
 msgstr "_���廡�:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2284
 msgid "_Instance:"
 msgstr "_�廩�廬:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2290
 msgid "_Recipient:"
 msgstr "_��廣�:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2301
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "��廖��� �廣廩�廬 ���� 廣� %s,%s,%s ��廩�"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2607
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;廩� �����&gt;: ��廬�廨 �廩廬�廩"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2612
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;廩� �����&gt;: ��廬�廨 �廩廬�廩"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2617
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2622
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2633
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;���廡�&gt; &lt;�廩�廬&gt; &lt;��廣�&gt;: �廢�廨廝 �廢'�� ��廩"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2638
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;�廩�廬&gt;: 廩�� ���廣� �-&lt;���廣�, <i>�廩�廬</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;���廡�&gt; &lt;�廩�廬&gt;: 廩�� ���廣� �-&lt;<i>���廡�</i>,<i>�廩�廬</i>*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2650
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10820,7 +12306,7 @@
 "zcir &lt;���廡�&gt; &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;<i>���廡�</i>,"
 "<i>�廩�廬</i>,<i>��廣�</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2656
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10828,15 +12314,15 @@
 "zir &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;���廣�,<i>�廩�廬</i>,<i>��廣�</"
 "i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2661
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;���廡�&gt;: 廩�� ���廣� �� &lt;<i>���廡�</i>,��廩�,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2767
 msgid "Resubscribe"
 msgstr "�廨廩� ���廩 �����"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2770
 msgid "Retrieve subscriptions from server"
 msgstr "廩��廝 �廬 ������� ��廩廨廬"
 
@@ -10850,80 +12336,70 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2856 ../src/protocols/zephyr/zephyr.c:2858
 msgid "Zephyr Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2883
 msgid "Export to .anyone"
 msgstr "��廢� �-.anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2886
 msgid "Export to .zephyr.subs"
 msgstr "��廢� �-.zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
+#: ../src/protocols/zephyr/zephyr.c:2889
 msgid "Import from .anyone"
 msgstr "���� �-.anyone"
 
-#: src/protocols/zephyr/zephyr.c:2883
+#: ../src/protocols/zephyr/zephyr.c:2892
 msgid "Import from .zephyr.subs"
 msgstr "���� �-.zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2886
+#: ../src/protocols/zephyr/zephyr.c:2895
 msgid "Realm"
 msgstr "����廨"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2898
 msgid "Exposure"
 msgstr "�廩�廚�"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1212 ../src/proxy.c:1265 ../src/proxy.c:1311
+#: ../src/proxy.c:1332
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "廩���� �廩廨廬 �廬���� %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1324
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "��� �廨廩��: 廩廨廬 �廬���� ��廖廨 廣� 廬�廣�� ��廢��� %d."
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "廩���� �廩廨廬 �廬���� %d"
-
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318
 msgid "Invalid proxy settings"
 msgstr "���廨�廬 �� 廬廡廚�廬 廩� �廬�����"
 
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "�� �廬��廬 �廩廨廬 �� �廢��廬 �廩廨廬 廩��廬�� 廣��廨 廖�� ��廬��� 廩����廨�� 廬廡廚��."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "�廩廨"
-
-#: src/server.c:243
+#: ../src/savedstatuses.c:514
+msgid "saved statuses"
+msgstr "廖���廖�� �廩�廨�"
+
+#: ../src/savedstatuses.c:767
+msgid "I'm not here right now"
+msgstr "��� �� ��� �廨�廣"
+
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ���廣 �廣廬 �廩� %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d ���廣�)"
-msgstr[1] "(%d ���廣�廬)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(���廣� 1)"
-
-#: src/server.c:859
+#: ../src/server.c:675
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10932,146 +12408,389 @@
 "%s ����� �廬 %s ���廨 �廢'�� %s:\n"
 "%s"
 
-#: src/server.c:864
+#: ../src/server.c:680
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ����� �廬 %s ���廨 �廢'�� %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:684
 msgid "Accept chat invitation?"
 msgstr "�廡�� ����� �廢'��?"
 
-#: src/status.c:153
+#: ../src/status.c:153
 msgid "Unset"
 msgstr "���"
 
-#: src/status.c:156
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "�� ����"
 
-#: src/status.c:621
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "����"
+
+#: ../src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s �廬��廨"
+
+#: ../src/status.c:627
 #, c-format
 msgid "%s came back"
 msgstr "%s ��廨"
 
-#: src/status.c:626
+#: ../src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s �廬�廬廡"
+
+#: ../src/status.c:638
 #, c-format
 msgid "%s went away"
 msgstr "%s �廬廨�廡 ����廩�"
 
-#: src/status.c:1308
+#: ../src/status.c:1284
 #, c-format
 msgid "%s became idle"
 msgstr "%s �廖廨 廚廣���廬"
 
-#: src/status.c:1323
+#: ../src/status.c:1297
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ��� �廚廣���廬"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "廨���廡 �������"
-
-#: src/util.c:2121
+#: ../src/status.c:1359
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s �廖廨 廚廣���廬"
+
+#: ../src/status.c:1361
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s ��� �廚廣���廬"
+
+#: ../src/util.c:649
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2439
 #, c-format
 msgid "Error Reading %s"
 msgstr "廩���� �廡廨��廬 %s"
 
-#: src/util.c:2122
-#, fuzzy, c-format
+#: ../src/util.c:2440
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 "��� 廩���� �廣廬 廡廨��廬 �-%s 廩��.  �� �� ��廣��, �廩� �廡��廛 ��廩� ����廝 �-%s~."
 
-#: src/util.c:2567
+#: ../src/util.c:2933
 msgid "Calculating..."
 msgstr "��廩�..."
 
-#: src/util.c:2570
+#: ../src/util.c:2936
 msgid "Unknown."
 msgstr "�� ���廣"
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "廩����"
-msgstr[1] "廩���廬"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "���"
-msgstr[1] "����"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "廩廣�"
-msgstr[1] "廩廣�廬"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "�廡�"
-msgstr[1] "�廡�廬"
-
-#: src/util.c:3053
+#: ../src/util.c:2962
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 廩����"
+msgstr[1] "%d 廩���廬"
+
+#: ../src/util.c:2974
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ���"
+msgstr[1] "%d ����"
+
+#: ../src/util.c:2982
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d 廩廣�"
+msgstr[1] "%s, %d 廩廣�廬"
+
+#: ../src/util.c:2988
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 廩廣�"
+msgstr[1] "%d 廩廣�廬"
+
+#: ../src/util.c:2996
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d �廡�"
+msgstr[1] "%s, %d �廡�廬"
+
+#: ../src/util.c:3002
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d �廡�"
+msgstr[1] "%d �廡�廬"
+
+#: ../src/util.c:3477
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 廩���� �廣廬 廚廬��廬 ����廨 廬廡廩�廨廬.\n"
 
-#~ msgid "New..."
-#~ msgstr "��廩..."
+#~ msgid "Join A Chat..."
+#~ msgstr "�廢�廨廝 �廩���..."
+
+#~ msgid "Gaim - Signed off"
+#~ msgstr "���� - �廬�廬廡"
+
+#~ msgid "Gaim - Away"
+#~ msgstr "���� - �� ����"
+
+#~ msgid "Screenname:"
+#~ msgstr "廩� �廬廢���:"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation.\n"
+#~ "\n"
+#~ "The history plugin requires logging be enabled. Logging can be enabled "
+#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
+#~ "and/or chats will activate history for the same conversation type(s)."
+#~ msgstr ""
+#~ "廬�廖廝 ���廖��廨�� ��廨廩 廩����� 廨�廩�� ���� 廚廣����. ��廬� ��廚廩廨 廨�廩�� �廬�� ���� -"
+#~ "> �廣�廚�廬 -> 廨�廩��.\n"
+#~ "\n"
+#~ "��廚廩�廨 ������ ����廣�廬 �/�� 廢'���� �廚廣�� ��廖��廨�� 廣��廨 ��廬� 廖��� 廩���廬."
+
+#~ msgid "Set account idle time"
+#~ msgstr "廡�廣 �廬 ��� ��廖廨 �廚廣���廬 廩� ��廩���"
+
+#~ msgid "Unset account idle time"
+#~ msgstr "��� �廬 ��� ��廖廨 �廚廣���廬 廩� ��廩���"
+
+#~ msgid "(+%d more)"
+#~ msgstr "(+%d ��廖廚��)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr ".(%s) 廣�� �廬 ���廨"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "���廖�� �廨廩��廬 ��廩� �廡廩廨 廩��?"
+
+#~ msgid "_Alias Buddy..."
+#~ msgstr "廩� ��廖廝 ���廩 �廡廩廨..."
+
+#~ msgid "Alias Contact..."
+#~ msgstr "廩� ��廖廝 ���廩 �廡廩廨..."
+
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/����/廚廣���廬 �廩��_�"
+
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/����/_�廩����廬"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Contact Alias:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>廩� ��廖廝 ���廩 �廡廩廨:</b> %s"
+
+#~ msgid "Idle "
+#~ msgstr "��廖廨 廚廣���廬 "
+
+#~ msgid "Offline "
+#~ msgstr "�� �廡��� "
+
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/����/廚廣���廬 �廩��_�"
+
+#~ msgid ""
+#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
+#~ "<BR><BR>"
+#~ msgstr ""
+#~ "���� ���� 廬���廬 廢'�� �廩���廬 ���廣�廬 �����廨�廬 �廬���廬 �廩���廩 �AIM, MSN, "
+#~ "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zepher,�-Gadu-"
+#~ "Gadu �廣廬 ��廣��� ��廬.��� ��廬�� 廬�� 廩���廩 �-Gtk+ �廬�廬 ������ �廩���廩 廩� �-"
+#~ "GNU GPL.>BR><BR>"
+
+#~ msgid "Active Developers"
+#~ msgstr "�廚廬��� 廚廣����"
+
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "廩��� �-%s 廣� %s"
+
+#~ msgid "Conversation with %s on %s"
+#~ msgstr "廩��� 廣� %s 廣� %s"
+
+#~ msgid "Default"
+#~ msgstr "�廨�廨廬 ����"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">��廬:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">�����:</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span size=\"larger\" weight=\"bold\">���廨 ��廩 ���廖!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "Pounce Action"
+#~ msgstr "��廨 廚廣��廬 廬����"
+
+#~ msgid "Persists"
+#~ msgstr "�廩�廨"
+
+#~ msgid "Custom..."
+#~ msgstr "��廬�� ��廩�廬..."
+
+#~ msgid "_Warn"
+#~ msgstr "�_��廨"
+
+#~ msgid "Host name"
+#~ msgstr "廩� 廩廨廬"
+
+#~ msgid "Change password"
+#~ msgstr "廩�� 廖�廖��"
+
+#~ msgid "Jabber ID"
+#~ msgstr "����� Jabber"
+
+#~ msgid "Hidden"
+#~ msgstr "��廖廬廨"
+
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "廩���� �廣���� ��廨�廣 �� �廩�� (%s)."
+
+#~ msgid "Away Message"
+#~ msgstr "���廣廬 廨���廡 ����廩�"
+
+#~ msgid "Hide IP address"
+#~ msgstr "�廖廬廨 �廬��廬 IP"
+
+#~ msgid "Web aware"
+#~ msgstr "���廣 廨廩廬"
+
+#~ msgid "Connected to Sametime Community Server"
+#~ msgstr "����廨 �廩廨廬 廡���� 廩� Sametime"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status</b>: %s"
+#~ msgstr "<b>�廢�:</b> %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+
+#, fuzzy
+#~ msgid "Add User"
+#~ msgstr "AP �廩廬�廩"
+
+#, fuzzy
+#~ msgid "Active Message"
+#~ msgstr "廩���廬 ���廣�"
+
+#, fuzzy
+#~ msgid "Busy Message"
+#~ msgstr "���廣廬 廨���廡 ����廩�"
+
+#, fuzzy
+#~ msgid "Default status messages"
+#~ msgstr "_廨廩�� �廬 �� ����廣�廬"
+
+#, fuzzy
+#~ msgid "Edit Status Messages"
+#~ msgstr "廣廨�� ���廣� ��"
+
+#, fuzzy
+#~ msgid "Set Status Messages..."
+#~ msgstr "��廨� ���廣廬 �廢�"
+
+#, fuzzy
+#~ msgid "NotesBuddy Encoding"
+#~ msgstr "廡���� 廩�� �廬��"
+
+#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
+#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
+
+#~ msgid "Hello!"
+#~ msgstr "廩���!"
+
+# prev line added per "msgfmt" recommendation
+#~ msgid "Error Message Suppression"
+#~ msgstr "����� ���廣�廬 廩����"
+
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "�廖廬廨 ���廣�廬 ��廬�廡"
+
+#~ msgid "Hide Login Errors"
+#~ msgstr "�廖廬廨 廩����廬 �廬��廨�廬"
+
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "�廖廬廨 ���� �����廨 ���廩"
+
+#~ msgid "Auto-Reconnect"
+#~ msgstr "�廬��廨 ���廩 �廢�廨� �������廬"
+
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr "��廩廨 ��廬廡�� ��廬�, �廬��廨 ���廩 廣廢���廬"
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "�廩廬�廩 ���廩 �廡廩廨 ���廨�� �廬���"
+
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
+#~ "used to be\n"
+#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ msgstr ""
+#~ "��廩 �廡廩廨 廣� ���廡�� ��� ���� ���� �廣� �廣��廚�廬 �廨�廩��� ����. \n"
+#~ "廣廨�� �廨�廨廬 ����� (���廬廡 = 4, �廨��廡 = 2, ��廖廨 廚廣���廬 = 1)\n"
+#~ "�廩廬�廩� ��� 廩��� 廚廣� �廖�廨 ������ 廩�: 廚廣��, �� 廚廣��, �廨��廡, �廨��廡 + �� "
+#~ "廚廣��,-���廬廡."
 
 #~ msgid "Back"
 #~ msgstr "��廨"
 
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "���廨�廬 廖�� ��廩 ��廣廨�廬"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr "_�廖廬廨 ���廣�廬 ��廩�廬 廣� ����廢� 廣� 廖�� ��廩 ��廣廨�廬"
 
 #~ msgid "Show user details"
 #~ msgstr "�廢� 廚廨�� ��廩廬�廩"
 
-#~ msgid "_Apply"
-#~ msgstr "_���"
-
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/����/廚廣���廬 廬_�廖廚��"
 
 #~ msgid "/Tools/_Statuses"
 #~ msgstr "/����/_�廢�� 廚廣���廬"
 
-#~ msgid "Reconnect"
-#~ msgstr "�廬_��廨 ���廩"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s ��廬廡.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "�廖��� ���� ���廣�."
-
-#~ msgid "_Reconnect"
-#~ msgstr "�廬_��廨 ���廩"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "��廨 ��� ���廩"
-
-#~ msgid "Time"
-#~ msgstr "���"
+#~ msgid "_Keep the dialog open"
+#~ msgstr "�廩�廨 �廬 ����� 廚廬��"
 
 #~ msgid "Show transfer details"
 #~ msgstr "�廢� �廬 廚廨�� ��廣�廨�廬"
@@ -11082,8 +12801,23 @@
 #~ msgid "Size of the expander arrow"
 #~ msgstr "����� 廩� �廛 ��廨���"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "廖���廨 廨廩��廬 ��廩� �廡廩廨"
+#~ msgid "A_way"
+#~ msgstr "_�廨��廡 ����廩�"
+
+#~ msgid "_Idle"
+#~ msgstr "�� 廚廣��"
+
+#~ msgid "Retur_n from idle"
+#~ msgstr "��廨 �廚廣���廬"
+
+#~ msgid "Bro_wse..."
+#~ msgstr "_廣���..."
+
+#~ msgid "Sav_e this pounce after activation"
+#~ msgstr "廩��廨 廬���廬-廚廣���廬 �� ���廨 �廚廣�廬�"
+
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "�廖廨 廬���廬 廚廣���廬"
 
 #~ msgid "_Sorting:"
 #~ msgstr "廖_�廨:"
@@ -11094,8 +12828,8 @@
 #~ msgid "Show more buddy details"
 #~ msgstr "�廢� 廣�� 廚廨��� 廣� ��廩 �廡廩廨"
 
-#~ msgid "Message Logs"
-#~ msgstr "廨�廩�� ���� ���廣�廬"
+#~ msgid "Gnome Default"
+#~ msgstr "�廨�廨廬 ���� 廩� GNOME"
 
 #~ msgid "System Logs"
 #~ msgstr "廨�廩��� �廣廨�廬"
@@ -11115,6 +12849,9 @@
 #~ msgid "Log your own _signons/idleness/awayness"
 #~ msgstr "廨廩�� 廩������ �_廖���廖 廩�� �廨���廡/廚廣���廬/��廬�廡"
 
+#~ msgid "_Queue new messages when away"
+#~ msgstr "廩�� ���廣�廬 ��廩�廬 �_廬�廨 ��廩廨 �廨��廡 ����廩�"
+
 #~ msgid "Idle _Tracking:"
 #~ msgstr "����� _��� ��廖廨 廚廣���廬"
 
@@ -11133,19 +12870,6 @@
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">��廬� 廣\"�:</span>\t%s\n"
-#~ "<span weight=\"bold\">�廬廨:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">廩� 廡��廛:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
 #~ "<span weight=\"bold\">Written by:</span>  %s\n"
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">File name:</span>  %s"
@@ -11156,29 +12880,20 @@
 #~ "<span weight=\"bold\">�廬廨:</span>  %s\n"
 #~ "<span weight=\"bold\">廩� 廡��廛:</span>  %s"
 
-#~ msgid "Load"
-#~ msgstr "�廣�"
-
 #~ msgid "Summary"
 #~ msgstr "廖����"
 
 #~ msgid "Details"
 #~ msgstr "廚廨���"
 
-#~ msgid "Plugins"
-#~ msgstr "廬�廖廚��"
-
 #~ msgid "Out of the office"
 #~ msgstr "���廛 ��廩廨�"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "�廡廖� 廨���"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "�廨�廨廬 ���� 廡廢廬 廚��廬 �廩廣��廬"
+#~ msgid "Could't open file"
+#~ msgstr "�� ��廬� �廚廬�� �廬 �廡��廛"
+
+#~ msgid "Token Error: Unable to fetch the token.\n"
+#~ msgstr "廩���廬 廣廨�: �� ��廬� ��廩�� �廬 �廣廨�.\n"
 
 #~ msgid "IRC"
 #~ msgstr "IRC"
@@ -11186,17 +12901,25 @@
 #~ msgid "Quit message"
 #~ msgstr "���廣廬 �廢���"
 
-#~ msgid "Buddy Information for %s"
-#~ msgstr "���廣 廣� ��廩 �廡廩廨 %s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "廚廨�廚�� Jabber"
-
-#~ msgid "User Properties"
-#~ msgstr "��廚���� ��廩廬�廩"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "廚廨�� ICQ 廣��廨 %s"
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "�� ��廬� �廡��廣 �廬 ���廣廬 �廨���廡 ����廩� 廩� AIM."
+
+#~ msgid ""
+#~ "You have probably requested to set your away message before the login "
+#~ "procedure completed.  You remain in a \"present\" state; try setting it "
+#~ "again when you are fully connected."
+#~ msgstr ""
+#~ "��廨�� ��廖�廬 �廡��廣 ���廣廬 廨���廡 ����廩� �廚�� 廩�廖廬��� 廬���� ��廬��廨�廬.�廢�� "
+#~ "��廬廨 \"��廢�\"; �廚廩廨 ��廖�廬 廩�� ��廨� 廩廬���� ����廨�廬 �廖廬����."
+
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "���� �廬���廬 廣� �� ����廣�廬 �������廬"
+
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "�廬�� �������廬 廣� �� ����廣�廬 ���廨"
+
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "���� �廬���廬 廣� �� ����廣�廬 ���廨"
 
 #~ msgid "Basic Profile"
 #~ msgstr "廚廨�廚�� �廖�廖�"
@@ -11204,9 +12927,6 @@
 #~ msgid "Profile Information"
 #~ msgstr "���廣 �廚廨�廚��"
 
-#~ msgid "Instant Messagers"
-#~ msgstr "廬����廬 �廖廨�� ������"
-
 #~ msgid "AIM"
 #~ msgstr "AIM"
 
@@ -11240,6 +12960,50 @@
 #~ msgid "Trepia Protocol Plugin"
 #~ msgstr "廬�廖廝 廚廨���廡�� Trepia"
 
+#~ msgid "Stealth"
+#~ msgstr "�廖廬廨"
+
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "(%d ���廣�)"
+#~ msgstr[1] "(%d ���廣�廬)"
+
+#~ msgid "(1 message)"
+#~ msgstr "(���廣� 1)"
+
+#~ msgid "Default auto-away"
+#~ msgstr "�廨�廨廬 ���� �廨���廡 �������"
+
+#~ msgid "Complete words"
+#~ msgstr "�廩�� �����"
+
+#~ msgid "Reconnect"
+#~ msgstr "�廬_��廨 ���廩"
+
+#~ msgid "Reason Unknown."
+#~ msgstr "�廖��� ���� ���廣�."
+
+#~ msgid "_Reconnect"
+#~ msgstr "�廬_��廨 ���廩"
+
+#~ msgid "Time"
+#~ msgstr "���"
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "�廨�廨廬 ���� 廡廢廬 廚��廬 �廩廣��廬"
+
+#~ msgid "Buddy Information for %s"
+#~ msgstr "���廣 廣� ��廩 �廡廩廨 %s"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "廚廨�廚�� Jabber"
+
+#~ msgid "User Properties"
+#~ msgstr "��廚���� ��廩廬�廩"
+
+#~ msgid "ICQ Info for %s"
+#~ msgstr "廚廨�� ICQ 廣��廨 %s"
+
 #~ msgid "Restore Away State On Reconnect"
 #~ msgstr "���廨 ����廨 ���廩, ���廨 �廬 �廢� �廨���廡 ����廩� ��廢�� �廚�� ���廬�廡"
 
@@ -11261,12 +13025,6 @@
 #~ msgid "Signoff"
 #~ msgstr "�廬廡"
 
-#~ msgid "Orientation"
-#~ msgstr "�����"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "����� ��廩 ��廣廨�廬"
-
 #~ msgid "Not connected to AIM"
 #~ msgstr "�� ����廨 � AIM"
 
@@ -11301,26 +13059,12 @@
 #~ msgstr ""
 #~ "��廚廩廨 ����� ����廬 �廩�� 廣\"� 廬���廬 廢�-廩��廩� �� 廣\"� 廬���廬 �廩��-廨�廡 廩� ����."
 
-#~ msgid "GTK Signals Test"
-#~ msgstr "���廡廬 ��廨�廣� GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "���廡 廩�� ���廨�廣� ���廩廡 廣����� ��� 廩廢廨��"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr "��廩廨 ���� 廩��� ��廩 �廚廬�, 廬�廖廝 �� ����廖 �廬 �廩��� ���廨��� �廨�廩 �����."
-
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "���� 廨廩��廬 ��廩� �廡廩廨 �廬�� 廣���� �廝 ����廬� 廣���"
 
 #~ msgid "Away!"
 #~ msgstr "廨��廡 ����廩�!"
 
-#~ msgid "Edit This Message"
-#~ msgstr "廣廨�� ���廣� ��"
-
 #~ msgid "I'm Back!"
 #~ msgstr "��廨廬�"
 
@@ -11352,9 +13096,6 @@
 #~ msgid "_Save"
 #~ msgstr "廩��廨"
 
-#~ msgid "Sa_ve & Use"
-#~ msgstr "廩��廨 ��廩廬�廩"
-
 #~ msgid "Buddy List Error"
 #~ msgstr "廩��廣� �廨廩��廬 ��廩� �廡廩廨"
 
@@ -11483,13 +13224,6 @@
 #~ "\n"
 #~ "<b>�廩���:</b>"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>����廨:</b>"
-
 #~ msgid "Warned (%d%%) "
 #~ msgstr "����廨 (%d%%) "
 
@@ -11553,15 +13287,6 @@
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "�廖廨 �廬 ��廩廬�廩 �廨廩��廬 ��廩� �廡廩廨 廩��"
 
-#~ msgid "Send"
-#~ msgstr "廩��"
-
-#~ msgid "Send message"
-#~ msgstr "廩�� ���廣�"
-
-#~ msgid "Invite"
-#~ msgstr "����"
-
 #~ msgid "Invite a user"
 #~ msgstr "���� �廩廬�廩"
 
@@ -11598,9 +13323,6 @@
 #~ msgid "Albanian"
 #~ msgstr "�����廬"
 
-#~ msgid "Turkish"
-#~ msgstr "廬�廨��廬"
-
 #~ msgid "Ukrainian"
 #~ msgstr "��廡廨����廬"
 
@@ -11644,9 +13366,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "�廢� ��廬��廬-��� �廢� ���廣�廬"
 
-#~ msgid "Ignore c_olors"
-#~ msgstr "�廬廣�� �_廢�廣��"
-
 #~ msgid "Ignore font _faces"
 #~ msgstr "�廬廣�� �_廖�� ���廚�"
 
@@ -11659,15 +13378,9 @@
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_廩�� �廬 廚�廨�� �廨�廨廬 ����� 廩�� 廣� ���廣�廬 ��廢��廬"
 
-#~ msgid "Send Message"
-#~ msgstr "廩���廬 ���廣�"
-
 #~ msgid "Enter _sends message"
 #~ msgstr "_廩�� ���廣� ����廢廬 \"Enter\""
 
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "廩�� ���廣� ����廢廬 \"Ctrl+Enter\""
-
 #~ msgid "Window Closing"
 #~ msgstr "廖��廨廬 ������廬"
 
@@ -11701,9 +13414,6 @@
 #~ msgid "Show _warning levels"
 #~ msgstr "�廢� �廬 廨��廬 �_��廨�"
 
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "�廨�� ��廩� 廡廩廨 �������廬"
-
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "�廚廩廨 廚廡���廬 \"廡�-����\""
 
@@ -11737,9 +13447,6 @@
 #~ msgid "Shortcuts"
 #~ msgstr "廡�廢�廨� �廡廩��"
 
-#~ msgid "Away Messages"
-#~ msgstr "���廣�廬 廨���廡 ����廩�"
-
 #~ msgid "Please create an account."
 #~ msgstr "��� 廢�廨 �廩��� ��廩"
 
@@ -11819,9 +13526,6 @@
 #~ msgid "Unable to resolve hostname."
 #~ msgstr "��� �廚廩廨�廬 ��廖�廡 �廬 廩� ���廨�"
 
-#~ msgid "Error while reading from socket."
-#~ msgstr "廩���� �廡廨��廬 �廬���� ��廩廡廣"
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "廩���� ��廬��廬 ����廣� �� �廩廡廣."
 
@@ -11831,12 +13535,6 @@
 #~ msgid "Unknown Error Code."
 #~ msgstr "廡�� 廩���� �� ���廨"
 
-#~ msgid "Status: %s"
-#~ msgstr "�廢�: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "�� ��廬� ��廬��廨"
-
 #~ msgid "Reading data"
 #~ msgstr "廡�廨� �廬����"
 
@@ -11870,15 +13568,9 @@
 #~ msgid "Couldn't get search results"
 #~ msgstr "�� ��廬� �廡�� 廬�廢��廬 ���廚�廩"
 
-#~ msgid "Birth Year"
-#~ msgstr "廩�廬 ����"
-
 #~ msgid "Sex"
 #~ msgstr "���:"
 
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "��� 廨廩��廬 ��廩� 廡廩廨 ����廖�廬 廣� 廩廨廬 �-Gadu-Gadu."
-
 #~ msgid "Couldn't Import Buddy List from Server"
 #~ msgstr "�� ��廬� ����� �廬 廨廩��廬 ��廩� �廡廩廨 ��廩廨廬."
 
@@ -11917,9 +13609,6 @@
 #~ "�� ��� �廚廩廨�廬 ����� ��廬��廨 �� 廩廨廬 廨廩��廬 ��廩� �廡廩廨 廩� Gadu-Gadu.��廬� ��廖�廬 "
 #~ "廩��廬 ����廨 ��廬廨."
 
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "�� ��廬� ���廢� �廬 廨廩��廬 ��廩� �廡廩廨"
-
 #~ msgid ""
 #~ "Gaim was unable to connect to the buddy list server.  Please try again "
 #~ "later."
@@ -11947,9 +13636,6 @@
 #~ "���� �� ���� �廩��廬 �廬 廖�廖�廬� 廣廡� 廩���� ��廬��廨�廬 �� 廩廨廬 �-Gadu-Gadu.��廬� "
 #~ "��廖�廬 廩��廬 ����廨 ��廬廨."
 
-#~ msgid "Directory Search"
-#~ msgstr "��廚�廩 ���廨��"
-
 #~ msgid "Unable to access user profile."
 #~ msgstr "�� ��廬� ��廩廬 �廚廨�廚�� ��廩廬�廩."
 
@@ -11960,9 +13646,6 @@
 #~ "���� �� ���� ��廩廬 �� 廚廨�廚�� �廩廬�廩 �� 廣廡� 廩���廬 �廬��廨�廬 �� 廩廨廬 ���廨��.��廬� "
 #~ "��廖�廬 廩��廬 ����廨 ��廬廨."
 
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "���� �廬廡� �廩���� �廣廬 廬廡廩�廨廬 廣� 廩廨廬 �-ICQ."
-
 #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 #~ msgstr "��廩廬�廩 %s (%s%s%s%s%s) 廨�廢� ��� �廨廩��."
 
@@ -11975,18 +13658,12 @@
 #~ msgid "Nick:"
 #~ msgstr "�����:"
 
-#~ msgid "Gaim User"
-#~ msgstr "�廩廬�廩 � Gaim"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "�廣�廨廬 �廡��廛 �����"
 
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "廩� �廩廬�廩 �� ��廡� '%s'"
 
-#~ msgid "Invalid nickname"
-#~ msgstr "廩� ��廩廬�廩 �� ��廡�"
-
 #~ msgid "Roomlist Error"
 #~ msgstr "廩���� �廨廩��廬 ���廨��"
 
@@ -12018,12 +13695,6 @@
 #~ msgstr ""
 #~ "廩���� 0x%04x: �� ��廬� �廚廨�� �廬 廩� ��廩廬�廩, ���� 廩廩� ��廩廬�廩 �廖廬��� �廨���."
 
-#~ msgid "Visible"
-#~ msgstr "�廨��"
-
-#~ msgid "Available Message:"
-#~ msgstr "���廣廬 �����廬:"
-
 #~ msgid "I'm doing work and hoping for a distraction--IM me!"
 #~ msgstr "��� 廣��� ��廡��� ��廩�� ��廖�� �廬 ��廣廬 -- 廩��� ���廣�廬!"
 
@@ -12044,15 +13715,6 @@
 #~ msgid "%s logged in."
 #~ msgstr "%s �廬��廨."
 
-#~ msgid "%s signed on"
-#~ msgstr "%s �廬��廨"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s �廬�廬廡"
-
-#~ msgid "%s signed off"
-#~ msgstr "%s �廬�廬廡"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -12097,27 +13759,15 @@
 #~ msgid "Local Addressbook"
 #~ msgstr "廚�廡廖 �廬���廬 �廡���"
 
-#~ msgid "_Accounts"
-#~ msgstr "_�廩����廬"
-
 #~ msgid "_Preferences"
 #~ msgstr "�廣�廚�廬"
 
-#~ msgid "Initiate Chat"
-#~ msgstr "���� 廩���"
-
 #~ msgid "Update Buddy Icon"
 #~ msgstr "廣��� �廬 廖�� ��廩 �廡廩廨"
 
-#~ msgid "Unable to connect to server"
-#~ msgstr "�� ��廬� ��廬��廨 �廩廨廬"
-
 #~ msgid "Requesting to send password"
 #~ msgstr "��廡廩 ��廩�廨 �廩���廬 廖�廖��"
 
-#~ msgid "Syncing with server"
-#~ msgstr "�廬�� 廣� �廩廨廬"
-
 #~ msgid "Unable to connect to %s server"
 #~ msgstr "�� ��廬� ��廬��廨 �廩廨廬 %s"
 
@@ -12142,21 +13792,12 @@
 #~ msgid "Userid"
 #~ msgstr "�廩廬�廩 廩�"
 
-#~ msgid "Your message did not get sent."
-#~ msgstr "����廣� 廩�� �� �廩���."
-
 #~ msgid "Your message to %s did not get sent:"
 #~ msgstr "����廣� 廩�� �-%s �� �廩���:"
 
 #~ msgid "boring default"
 #~ msgstr "�廨�廨廬 ����� �廩廣��廬"
 
-#~ msgid "_Send auto-response"
-#~ msgstr "廩�� 廬���� ���廚� �������"
-
-#~ msgid "Set"
-#~ msgstr "廡�廣"
-
 #~ msgid "idle for"
 #~ msgstr "�� 廚廣��"
 
@@ -12181,9 +13822,6 @@
 #~ msgid "_Bold"
 #~ msgstr "_����廩"
 
-#~ msgid "_Italic"
-#~ msgstr "_����"
-
 #~ msgid "_Underline"
 #~ msgstr "_廡� 廬�廬��"
 
@@ -12208,9 +13846,6 @@
 #~ msgid "Bac_kground color"
 #~ msgstr "廢�廣 �廨廡廣"
 
-#~ msgid "Show graphical _smileys"
-#~ msgstr "�廢� 廚廨廢�廚�� �_������"
-
 #~ msgid "Show _URLs as links"
 #~ msgstr "�廢� �廬 �廬���廬 ����廨�� �廬�廨 廡�廩�廨��"
 
@@ -12280,9 +13915,6 @@
 #~ msgid "Seconds before _resending:"
 #~ msgstr "_廩���廬 �廚�� 廩���� ����廩廬:"
 
-#~ msgid "Fonts"
-#~ msgstr "��廚���"
-
 #~ msgid "IMs"
 #~ msgstr "���廣�廬 ������廬"
 
@@ -12325,9 +13957,6 @@
 #~ msgid "IO Error."
 #~ msgstr "廩���廬 廡��/廚��"
 
-#~ msgid "An MSN message may not have been received."
-#~ msgstr "���� ����廬 廩���廣廬 �MSN �� �廬廡���."
-
 #~ msgid "Username: <b>%s</b><br>\n"
 #~ msgstr "廩� �廩廬�廩: <b>%s</b><br>\n"
 
@@ -12345,3 +13974,4 @@
 
 #~ msgid "Idle: <b>Active</b>"
 #~ msgstr "�� 廚廣��: <b>廚廣��</b>"
+
--- a/po/sl.po	Mon Feb 13 20:06:09 2006 +0000
+++ b/po/sl.po	Mon Feb 13 21:34:34 2006 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2006-02-07 09:13+0100\n"
+"PO-Revision-Date: 2006-01-29 13:05+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -141,7 +141,7 @@
 
 #. add enabled / disabled
 #: plugins/crazychat/cc_gaim_plugin.c:345
-#: src/gtkaccount.c:2234
+#: src/gtkaccount.c:2240
 #: src/gtkplugin.c:577
 msgid "Enabled"
 msgstr "Omogo�en"
@@ -174,7 +174,7 @@
 msgstr "Za ve� neprebranih sporo�il kliknite na desni mi邸kin gumb ...\n"
 
 #: plugins/docklet/docklet.c:157
-#: src/gtkblist.c:3277
+#: src/gtkblist.c:3276
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -183,12 +183,12 @@
 msgstr[2] "%d neprebrani sporo�ili od %s\n"
 msgstr[3] "%d neprebrana sporo�ila od %s\n"
 
-#: plugins/docklet/docklet.c:426
+#: plugins/docklet/docklet.c:401
 msgid "Change Status"
 msgstr "Spremeni stanje"
 
-#: plugins/docklet/docklet.c:429
-#: src/gtkstatusbox.c:660
+#: plugins/docklet/docklet.c:404
+#: src/gtkstatusbox.c:575
 #: src/protocols/jabber/buddy.c:1101
 #: src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30
@@ -201,123 +201,121 @@
 msgstr "Na voljo"
 
 #. Away stuff
-#: plugins/docklet/docklet.c:433
-#: src/gtkprefs.c:1752
-#: src/gtkstatusbox.c:661
+#: plugins/docklet/docklet.c:408
+#: src/gtkprefs.c:1748
+#: src/gtkstatusbox.c:576
 #: src/protocols/irc/irc.c:456
 #: src/protocols/irc/msgs.c:219
 #: src/protocols/jabber/buddy.c:1105
 #: src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:727
-#: src/protocols/oscar/oscar.c:6742
-#: src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:726
+#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:7824
 #: src/protocols/silc/buddy.c:1469
-#: src/protocols/yahoo/yahoo.c:3136
+#: src/protocols/yahoo/yahoo.c:3134
 #: src/status.c:158
 msgid "Away"
 msgstr "Odsoten"
 
-#: plugins/docklet/docklet.c:437
-#: src/gtkstatusbox.c:662
-#: src/protocols/oscar/oscar.c:731
+#: plugins/docklet/docklet.c:412
+#: src/gtkstatusbox.c:577
+#: src/protocols/oscar/oscar.c:730
 #: src/protocols/yahoo/yahoo.c:2676
 #: src/status.c:157
 msgid "Invisible"
 msgstr "Neviden"
 
-#: plugins/docklet/docklet.c:441
+#: plugins/docklet/docklet.c:416
 #: src/gtkblist.c:3015
-#: src/gtkstatusbox.c:663
+#: src/gtkstatusbox.c:578
 #: src/protocols/jabber/buddy.c:1099
 #: src/protocols/novell/novell.c:2857
-#: src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:7758
+#: src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:7796
 #: src/protocols/yahoo/yahoo.c:2680
 #: src/status.c:154
 msgid "Offline"
 msgstr "Brez povezave"
 
-#: plugins/docklet/docklet.c:461
+#: plugins/docklet/docklet.c:436
 msgid "New Status..."
 msgstr "Novo stanje ..."
 
-#: plugins/docklet/docklet.c:462
+#: plugins/docklet/docklet.c:437
 msgid "Saved Status..."
 msgstr "Shranjeno stanje ..."
 
-#: plugins/docklet/docklet.c:478
+#: plugins/docklet/docklet.c:453
 msgid "Show Buddy List"
 msgstr "Poka転i seznam prijateljev"
 
-#: plugins/docklet/docklet.c:483
+#: plugins/docklet/docklet.c:458
 msgid "Unread Messages"
 msgstr "Neprebrana sporo�ila"
 
-#: plugins/docklet/docklet.c:504
+#: plugins/docklet/docklet.c:479
 msgid "New Message..."
 msgstr "Novo sporo�ilo ..."
 
-#: plugins/docklet/docklet.c:513
-#: src/gtkaccount.c:2450
+#: plugins/docklet/docklet.c:488
+#: src/gtkaccount.c:2465
 msgid "Accounts"
 msgstr "Ra�uni"
 
-#: plugins/docklet/docklet.c:514
+#: plugins/docklet/docklet.c:489
 #: src/gtkplugin.c:541
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: plugins/docklet/docklet.c:515
-#: src/gtkprefs.c:1893
+#: plugins/docklet/docklet.c:490
+#: src/gtkprefs.c:1889
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: plugins/docklet/docklet.c:519
+#: plugins/docklet/docklet.c:494
 msgid "Mute Sounds"
 msgstr "Uti邸aj zvoke"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:532
+#: plugins/docklet/docklet.c:507
 msgid "Quit"
 msgstr "Kon�aj"
 
-#: plugins/docklet/docklet.c:673
+#: plugins/docklet/docklet.c:648
 msgid "Blink tray icon for unread..."
 msgstr "Utripaj ikono na pladnju za neprebrano ..."
 
-#: plugins/docklet/docklet.c:676
+#: plugins/docklet/docklet.c:651
 msgid "_Instant Messages:"
 msgstr "_Neposredna sporo�ila:"
 
-#: plugins/docklet/docklet.c:678
-#: plugins/docklet/docklet.c:686
+#: plugins/docklet/docklet.c:653
+#: plugins/docklet/docklet.c:661
 #: plugins/win32/winprefs/winprefs.c:411
 #: src/gtkprefs.c:816
-#: src/gtkprefs.c:1742
-#: src/gtkprefs.c:1756
+#: src/gtkprefs.c:1738
+#: src/gtkprefs.c:1752
 msgid "Never"
 msgstr "nikoli"
 
-#: plugins/docklet/docklet.c:679
+#: plugins/docklet/docklet.c:654
 msgid "In hidden conversations"
 msgstr "V skritih pogovorih"
 
-#: plugins/docklet/docklet.c:680
-#: plugins/docklet/docklet.c:688
-#: plugins/timestamp_format.c:39
-#: plugins/timestamp_format.c:48
+#: plugins/docklet/docklet.c:655
+#: plugins/docklet/docklet.c:663
 #: plugins/win32/winprefs/winprefs.c:412
 #: src/gtkprefs.c:818
 msgid "Always"
 msgstr "vedno"
 
-#: plugins/docklet/docklet.c:684
+#: plugins/docklet/docklet.c:659
 msgid "C_hat Messages:"
 msgstr "_Sporo�ila klepeta:"
 
-#: plugins/docklet/docklet.c:687
+#: plugins/docklet/docklet.c:662
 msgid "When my nick is said"
 msgstr "Ko je vzdevek v sporo�ilu"
 
@@ -327,19 +325,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:714
+#: plugins/docklet/docklet.c:689
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:717
+#: plugins/docklet/docklet.c:692
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Prika転e ikono za Gaim v sistemskem pladnju."
 
 #. *  description
-#: plugins/docklet/docklet.c:719
+#: plugins/docklet/docklet.c:694
 msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
 msgstr "Prika転e ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogo�a la転ji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prika転e seznam stikov ali prijavni zaslon. Omogo�a tudi mo転nosti utripanja ob neprebranih sporo�ilih."
 
@@ -507,10 +505,6 @@
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: plugins/gaimrc.c:415
-msgid "General"
-msgstr "Splo邸no"
-
 #: plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
@@ -519,18 +513,6 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bli転njic besedila GTK+"
 
-#: plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "Barve vmesnika"
-
-#: plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr "Velikosti gradnikov"
-
-#: plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "Pisave"
-
 #: plugins/gaimrc.c:543
 msgid "Tools"
 msgstr "Orodja"
@@ -610,7 +592,7 @@
 #: src/gtkplugin.c:590
 #: src/gtkroomlist.c:604
 #: src/protocols/jabber/jabber.c:686
-#: src/protocols/msn/msn.c:1524
+#: src/protocols/msn/msn.c:1515
 msgid "Name"
 msgstr "Ime"
 
@@ -619,34 +601,34 @@
 msgstr "Neposredno sporo�anje"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:454
+#: plugins/gevolution/add_buddy_dialog.c:458
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Izberite osebo iz va邸ega imenika spodaj ali dodajte novo."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:467
+#: plugins/gevolution/add_buddy_dialog.c:471
 #: plugins/gevolution/assoc-buddy.c:353
 #: src/protocols/jabber/buddy.c:1411
-#: src/protocols/oscar/oscar.c:8306
-#: src/protocols/sametime/sametime.c:5433
+#: src/protocols/oscar/oscar.c:8344
+#: src/protocols/sametime/sametime.c:5409
 msgid "Search"
 msgstr "I邸�i"
 
-#: plugins/gevolution/add_buddy_dialog.c:548
+#: plugins/gevolution/add_buddy_dialog.c:552
 #: plugins/gevolution/new_person_dialog.c:306
-#: src/gtkblist.c:4540
-#: src/gtkblist.c:4904
+#: src/gtkblist.c:4556
+#: src/gtkblist.c:4920
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:574
+#: plugins/gevolution/add_buddy_dialog.c:578
 #: plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:591
+#: plugins/gevolution/add_buddy_dialog.c:595
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
@@ -676,7 +658,7 @@
 #: src/blist.c:516
 #: src/blist.c:1269
 #: src/blist.c:1494
-#: src/gtkblist.c:4349
+#: src/gtkblist.c:4365
 #: src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Prijatelji"
@@ -716,7 +698,7 @@
 #: plugins/idle.c:147
 #: plugins/idle.c:183
 #: src/gtknotify.c:371
-#: src/gtkpounce.c:1259
+#: src/gtkpounce.c:1260
 msgid "Account"
 msgstr "Ra�un"
 
@@ -726,7 +708,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:527
+#: plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Integracija z Evolutionom"
 
@@ -734,8 +716,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:530
-#: plugins/gevolution/gevolution.c:532
+#: plugins/gevolution/gevolution.c:537
+#: plugins/gevolution/gevolution.c:539
 msgid "Provides integration with Evolution."
 msgstr "Omogo�a integracijo z Evolutionom."
 
@@ -765,7 +747,7 @@
 #: plugins/gevolution/new_person_dialog.c:337
 #: src/gtkaccount.c:407
 #: src/gtkaccount.c:429
-#: src/protocols/oscar/oscar.c:633
+#: src/protocols/oscar/oscar.c:632
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
@@ -800,11 +782,11 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "Preveri pravilnost delovanja vseh signalov uporabni邸kega vmesnika."
 
-#: plugins/history.c:143
+#: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr "Vstavek za zgodovino zahteva bele転enje v dnevnik"
 
-#: plugins/history.c:144
+#: plugins/history.c:147
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -814,15 +796,15 @@
 "\n"
 "Omogo�anje bele転enja v dnevnik za neposredna sporo�ila in/ali klepete aktivira zgodovino za istovrstne pogovore."
 
-#: plugins/history.c:184
+#: plugins/history.c:187
 msgid "History"
 msgstr "Zgodovina"
 
-#: plugins/history.c:186
+#: plugins/history.c:189
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prika転e nedavno zabele転ene pogovore v novih pogovorih."
 
-#: plugins/history.c:187
+#: plugins/history.c:190
 msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "Ko je odprt nov pogovor, ta vstavek vstavi zadnji pogovor v trenuten pogovor."
 
@@ -964,78 +946,78 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Preskusite vstavek s podporo IPC, kot stre転nik. Ukazi IPC bodo registrirani."
 
-#: plugins/log_reader.c:1407
+#: plugins/log_reader.c:1403
 msgid "User is offline."
 msgstr "Uporabnik ni na zvezi."
 
-#: plugins/log_reader.c:1413
+#: plugins/log_reader.c:1409
 msgid "Auto-response sent:"
 msgstr "Samodejni odgovor poslan:"
 
-#: plugins/log_reader.c:1423
-#: plugins/log_reader.c:1426
+#: plugins/log_reader.c:1419
+#: plugins/log_reader.c:1422
 #, c-format
 msgid "%s logged out."
 msgstr "Uporabnik %s se je odjavil."
 
-#: plugins/log_reader.c:1440
+#: plugins/log_reader.c:1436
 msgid "One or more messages may have been undeliverable."
 msgstr "Eno ali ve� sporo�il ni mogo�e dostaviti."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: plugins/log_reader.c:1450
+#: plugins/log_reader.c:1446
 #: src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "Povezava s stre転nikom je bila prekinjena."
 
-#: plugins/log_reader.c:1458
+#: plugins/log_reader.c:1454
 msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Trenutno niste povezani. Sporo�il ne boste mogli prejemati, dokler se ne pove転ete."
 
-#: plugins/log_reader.c:1473
+#: plugins/log_reader.c:1469
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Sporo�ila ni mogo�e poslati, saj je prese転ena najve�ja dol転ina."
 
-#: plugins/log_reader.c:1478
+#: plugins/log_reader.c:1474
 msgid "Message could not be sent."
 msgstr "Sporo�ila ni mogo�e poslati."
 
 #. Add general preferences.
-#: plugins/log_reader.c:1912
+#: plugins/log_reader.c:1908
 msgid "General Log Reading Configuration"
 msgstr "Splo邸ne nastavitve ogledovanja dnevnika"
 
+#: plugins/log_reader.c:1912
+msgid "Fast size calculations"
+msgstr "Hitri izra�uni velikosti"
+
 #: plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "Hitri izra�uni velikosti"
-
-#: plugins/log_reader.c:1920
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: plugins/log_reader.c:1926
+#: plugins/log_reader.c:1922
 msgid "Log Directory"
 msgstr "Imenik dnevnika"
 
+#: plugins/log_reader.c:1926
+msgid "Adium"
+msgstr "Adium"
+
 #: plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
-
-#: plugins/log_reader.c:1934
 msgid "Fire"
 msgstr "Fire"
 
-#: plugins/log_reader.c:1938
+#: plugins/log_reader.c:1934
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
+#: plugins/log_reader.c:1938
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
 #: plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: plugins/log_reader.c:1946
 msgid "Trillian"
 msgstr "Trillian"
 
@@ -1045,19 +1027,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/log_reader.c:1969
+#: plugins/log_reader.c:1965
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: plugins/log_reader.c:1973
+#: plugins/log_reader.c:1969
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Vklju�i dnevnike drugih odjemalcev neposrednih sporo�il v ogledovalnik dnevnika."
 
 #. * description
-#: plugins/log_reader.c:1977
+#: plugins/log_reader.c:1973
 msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
 msgstr "Pri ogledovanju dnevnikov bo ta vstavek vklju�il dnevnike drugih odjemalcev neposrednih sporo�il. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
 
@@ -1082,60 +1064,15 @@
 msgid "Loads .NET plugins with Mono."
 msgstr "Nalo転i vstavke .NET skupaj z Mono."
 
-#: plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Zahtevana je seja glasbenega sporo�anja. Prosimo, kliknite ikono MM za sprejem."
-
-#: plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Seja glasbenega sporo�anja potrjena."
-
-#: plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Glasbeno sporo�anje"
-
-#: plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "Pri zaganjanju ukaza je pri邸lo do napake:"
-
-#: plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Napaka pri uporabi urejevalnika"
-
-#: plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "Ppri邸lo do naslednje napake:"
-
 #. Configuration frame
-#: plugins/musicmessaging/musicmessaging.c:623
+#: plugins/musicmessaging/musicmessaging.c:622
 msgid "Music Messaging Configuration"
 msgstr "Nastavitve glasbe sporo�anja"
 
 #: plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Pot urejevalnika partiture"
-
-#: plugins/musicmessaging/musicmessaging.c:628
 msgid "_Apply"
 msgstr "Upor_abi"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Vti�nik za glasbeno sporo�anje - za skupinsko skladanje."
-
-#. *  summary
-#: plugins/musicmessaging/musicmessaging.c:665
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
-msgstr "Vti�nik za glasbeno sporo�anje omogo�a ve� uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resni�nem �asu."
-
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:632
 msgid "Notify For"
@@ -1245,34 +1182,6 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
 
-#: plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr "Telepatski na�in"
-
-#: plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
-msgstr "Telepatski na�in za dohodne pogovore"
-
-#: plugins/psychic.c:24
-msgid "Causes conversation windows to appear as other users begin to message you"
-msgstr "Povzro�i pojavitev pogovornih oken, ko za�nejo drugi uporabniki sporo�ati"
-
-#: plugins/psychic.c:59
-msgid "You feel a disturbance in the force..."
-msgstr "Ob�utite motnjo v Mo�i (saj veste, Vojna zvezd) ..."
-
-#: plugins/psychic.c:76
-msgid "Only enable for users on the buddy list"
-msgstr "Dovoli le uporabnikom s seznama prijateljev"
-
-#: plugins/psychic.c:81
-msgid "Disable when away"
-msgstr "Onemogo�i ob odsotnosti"
-
-#: plugins/psychic.c:85
-msgid "Display notification message in conversations"
-msgstr "Prika転i obvestilno sporo�ilo v pogovorih"
-
 #: plugins/raw.c:175
 msgid "Raw"
 msgstr "Direktno"
@@ -1572,8 +1481,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:77
-#: plugins/ticker/ticker.c:355
+#: plugins/ticker/ticker.c:75
+#: plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -1581,8 +1490,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:358
-#: plugins/ticker/ticker.c:360
+#: plugins/ticker/ticker.c:327
+#: plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna ina�ica seznama prijateljev."
 
@@ -1617,58 +1526,6 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Doda �ase nastanka vsakih N minut v slogu iChata."
 
-#: plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Mo転nosti zapisa �asovnega 転iga"
-
-#: plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Prisili (tradicionalni Gaim) 24-urni �asovni zapis"
-
-#: plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Poka転i datume v ..."
-
-#: plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Po_govori:"
-
-#: plugins/timestamp_format.c:37
-#: plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Za zakasnjena sporo�ila"
-
-#: plugins/timestamp_format.c:38
-#: plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Za zakasnjena sporo�ila in v pogovorih"
-
-#: plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Dnevniki _sporo�il:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "Zapisi �asovnega 転iga sporo�il"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "Prilagodi oblike �asovnega 転iga sporo�il po meri."
-
-#. *  description
-#: plugins/timestamp_format.c:155
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Ta vti�nik omogo�a uporabniku prilagajati zapis �asovnega 転iga pogovorov in dnevni邸kih sporo�il."
-
 #: plugins/win32/transparency/win2ktrans.c:183
 #: plugins/win32/transparency/win2ktrans.c:569
 #: plugins/win32/transparency/win2ktrans.c:616
@@ -1753,7 +1610,7 @@
 
 #. Buddy List
 #: plugins/win32/winprefs/winprefs.c:404
-#: src/gtkblist.c:3596
+#: src/gtkblist.c:3614
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
@@ -1774,7 +1631,7 @@
 #. Conversations
 #: plugins/win32/winprefs/winprefs.c:418
 #: src/gtkprefs.c:812
-#: src/gtkprefs.c:1857
+#: src/gtkprefs.c:1853
 msgid "Conversations"
 msgstr "Pogovori"
 
@@ -1833,13 +1690,13 @@
 #: src/protocols/msn/msn.c:265
 #: src/protocols/msn/msn.c:280
 #: src/protocols/msn/msn.c:295
-#: src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:4519
-#: src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:8037
-#: src/protocols/oscar/oscar.c:8160
-#: src/protocols/oscar/oscar.c:8185
-#: src/protocols/oscar/oscar.c:8237
+#: src/protocols/oscar/oscar.c:2976
+#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:8075
+#: src/protocols/oscar/oscar.c:8198
+#: src/protocols/oscar/oscar.c:8223
+#: src/protocols/oscar/oscar.c:8275
 #: src/protocols/silc/buddy.c:466
 #: src/protocols/silc/buddy.c:1182
 #: src/protocols/silc/chat.c:423
@@ -1848,8 +1705,8 @@
 #: src/protocols/silc/ops.c:1297
 #: src/protocols/silc/ops.c:1910
 #: src/protocols/silc/silc.c:749
-#: src/protocols/yahoo/yahoo.c:3010
-#: src/protocols/yahoo/yahoo.c:3019
+#: src/protocols/yahoo/yahoo.c:3008
+#: src/protocols/yahoo/yahoo.c:3017
 #: src/request.h:1340
 msgid "OK"
 msgstr "V redu"
@@ -1857,9 +1714,9 @@
 #: src/account.c:969
 #: src/account.c:1140
 #: src/account.c:1177
-#: src/gtkaccount.c:2154
-#: src/gtkaccount.c:2621
-#: src/gtkblist.c:4945
+#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2636
+#: src/gtkblist.c:4961
 #: src/gtkdialogs.c:571
 #: src/gtkdialogs.c:708
 #: src/gtkdialogs.c:776
@@ -1872,13 +1729,13 @@
 #: src/gtkdialogs.c:998
 #: src/gtkimhtmltoolbar.c:419
 #: src/gtkplugin.c:297
-#: src/gtkpounce.c:1092
-#: src/gtkprivacy.c:568
-#: src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606
-#: src/gtkprivacy.c:617
+#: src/gtkpounce.c:1093
+#: src/gtkprivacy.c:567
+#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:616
 #: src/gtkrequest.c:288
-#: src/gtksavedstatuses.c:307
+#: src/gtksavedstatuses.c:298
 #: src/protocols/gg/gg.c:455
 #: src/protocols/gg/gg.c:596
 #: src/protocols/gg/gg.c:732
@@ -1895,23 +1752,23 @@
 #: src/protocols/msn/msn.c:281
 #: src/protocols/msn/msn.c:296
 #: src/protocols/msn/msn.c:313
-#: src/protocols/oscar/oscar.c:1641
-#: src/protocols/oscar/oscar.c:2987
-#: src/protocols/oscar/oscar.c:4477
-#: src/protocols/oscar/oscar.c:4520
-#: src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:4601
-#: src/protocols/oscar/oscar.c:8038
-#: src/protocols/oscar/oscar.c:8161
-#: src/protocols/oscar/oscar.c:8186
-#: src/protocols/oscar/oscar.c:8238
-#: src/protocols/oscar/oscar.c:8307
-#: src/protocols/sametime/sametime.c:3323
-#: src/protocols/sametime/sametime.c:3408
-#: src/protocols/sametime/sametime.c:3536
-#: src/protocols/sametime/sametime.c:5221
-#: src/protocols/sametime/sametime.c:5310
-#: src/protocols/sametime/sametime.c:5434
+#: src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:2977
+#: src/protocols/oscar/oscar.c:4467
+#: src/protocols/oscar/oscar.c:4510
+#: src/protocols/oscar/oscar.c:4547
+#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:8076
+#: src/protocols/oscar/oscar.c:8199
+#: src/protocols/oscar/oscar.c:8224
+#: src/protocols/oscar/oscar.c:8276
+#: src/protocols/oscar/oscar.c:8345
+#: src/protocols/sametime/sametime.c:3320
+#: src/protocols/sametime/sametime.c:3403
+#: src/protocols/sametime/sametime.c:3530
+#: src/protocols/sametime/sametime.c:5207
+#: src/protocols/sametime/sametime.c:5293
+#: src/protocols/sametime/sametime.c:5410
 #: src/protocols/silc/buddy.c:467
 #: src/protocols/silc/buddy.c:1078
 #: src/protocols/silc/buddy.c:1183
@@ -1920,8 +1777,8 @@
 #: src/protocols/silc/ops.c:1911
 #: src/protocols/silc/silc.c:750
 #: src/protocols/silc/silc.c:955
-#: src/protocols/yahoo/yahoo.c:3011
-#: src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3018
 #: src/request.h:1340
 #: src/request.h:1350
 msgid "Cancel"
@@ -1935,7 +1792,7 @@
 
 #: src/account.c:996
 #: src/connection.c:99
-#: src/gtkblist.c:3484
+#: src/gtkblist.c:3483
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
@@ -1976,7 +1833,7 @@
 msgstr "Spremeni podatke za uporabika %s"
 
 #: src/account.c:1176
-#: src/gtkdebug.c:684
+#: src/gtkdebug.c:687
 #: src/gtkrequest.c:294
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
@@ -2175,31 +2032,31 @@
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokon�an."
 
-#: src/ft.c:1007
+#: src/ft.c:1005
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: src/ft.c:1012
+#: src/ft.c:1010
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: src/ft.c:1069
+#: src/ft.c:1067
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: src/ft.c:1074
+#: src/ft.c:1072
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: src/ft.c:1131
+#: src/ft.c:1129
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: src/ft.c:1133
+#: src/ft.c:1131
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
@@ -2230,8 +2087,8 @@
 msgstr "Geslo:"
 
 #: src/gtkaccount.c:846
-#: src/gtkblist.c:4523
-#: src/gtkblist.c:4889
+#: src/gtkblist.c:4539
+#: src/gtkblist.c:4905
 msgid "Alias:"
 msgstr "Psevdonim:"
 
@@ -2279,7 +2136,7 @@
 msgstr "SOCKS5"
 
 #: src/gtkaccount.c:1246
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1032
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -2296,17 +2153,17 @@
 msgstr "Mo転nosti stre転nika proxy"
 
 #: src/gtkaccount.c:1314
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:1026
 msgid "Proxy _type:"
 msgstr "Vrsta s_tre転nika proxy:"
 
 #: src/gtkaccount.c:1323
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:1047
 msgid "_Host:"
 msgstr "_Stre転nik:"
 
 #: src/gtkaccount.c:1327
-#: src/gtkprefs.c:1069
+#: src/gtkprefs.c:1065
 msgid "_Port:"
 msgstr "_Vrata:"
 
@@ -2315,7 +2172,7 @@
 msgstr "_Uporabni邸ko ime:"
 
 #: src/gtkaccount.c:1341
-#: src/gtkprefs.c:1106
+#: src/gtkprefs.c:1102
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
@@ -2341,45 +2198,45 @@
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gtkaccount.c:2148
-#: src/gtksavedstatuses.c:304
+#: src/gtkaccount.c:2154
+#: src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepri�ani, da 転elite izbrisati %s?"
 
-#: src/gtkaccount.c:2153
-#: src/gtkpounce.c:1091
+#: src/gtkaccount.c:2159
+#: src/gtkpounce.c:1092
 #: src/gtkrequest.c:291
-#: src/gtksavedstatuses.c:306
+#: src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "Zbri邸i"
 
-#: src/gtkaccount.c:2211
-#: src/gtksavedstatuses.c:887
-#: src/protocols/oscar/oscar.c:5164
+#: src/gtkaccount.c:2217
+#: src/gtksavedstatuses.c:877
+#: src/protocols/oscar/oscar.c:5154
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2242
+#: src/gtkaccount.c:2248
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2569
+#: src/gtkaccount.c:2584
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: src/gtkaccount.c:2618
+#: src/gtkaccount.c:2633
 msgid "Add buddy to your list?"
 msgstr "貼elite dodati prijatelja na seznam?"
 
-#: src/gtkaccount.c:2620
-#: src/gtkblist.c:4944
-#: src/gtkconv.c:1616
+#: src/gtkaccount.c:2635
+#: src/gtkblist.c:4960
+#: src/gtkconv.c:1615
 #: src/gtkrequest.c:292
 #: src/protocols/gg/gg.c:811
-#: src/protocols/oscar/oscar.c:4789
-#: src/protocols/sametime/sametime.c:5309
+#: src/protocols/oscar/oscar.c:4779
+#: src/protocols/sametime/sametime.c:5292
 #: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Dodaj"
@@ -2393,7 +2250,7 @@
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu 転elite pridru転iti.\n"
 
 #: src/gtkblist.c:710
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:528
 #: src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Ra�un:"
@@ -2403,7 +2260,7 @@
 msgstr "_Informacije"
 
 #: src/gtkblist.c:957
-#: src/gtkstock.c:141
+#: src/gtkstock.c:142
 msgid "I_M"
 msgstr "_Sporo�i"
 
@@ -2431,7 +2288,7 @@
 msgstr "Psevdonim ..."
 
 #: src/gtkblist.c:999
-#: src/gtkconv.c:1613
+#: src/gtkconv.c:1612
 #: src/gtkrequest.c:293
 msgid "Remove"
 msgstr "Odstrani"
@@ -2468,7 +2325,7 @@
 #: src/gtkblist.c:1080
 #: src/gtkroomlist.c:285
 #: src/gtkroomlist.c:441
-#: src/gtkstock.c:139
+#: src/gtkstock.c:140
 msgid "_Join"
 msgstr "_Pridru転i se"
 
@@ -2487,14 +2344,14 @@
 
 #: src/gtkblist.c:1426
 #: src/gtkblist.c:1438
-#: src/gtkblist.c:3741
-#: src/gtkblist.c:3751
+#: src/gtkblist.c:3759
+#: src/gtkblist.c:3769
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Uti邸aj zvoke"
 
 #: src/gtkblist.c:1901
-#: src/gtkconv.c:4203
-#: src/gtkpounce.c:426
+#: src/gtkconv.c:4212
+#: src/gtkpounce.c:427
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim ra�unom, ki lahko doda tega prijatelja."
 
@@ -2561,7 +2418,7 @@
 msgstr "/_Ra�uni"
 
 #: src/gtkblist.c:2495
-#: src/gtkblist.c:5523
+#: src/gtkblist.c:5537
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Ra�uni/Dodaj\\/Uredi"
 
@@ -2718,176 +2575,176 @@
 
 #. Idle stuff
 #: src/gtkblist.c:3011
-#: src/gtkprefs.c:1738
-#: src/protocols/bonjour/bonjour.c:333
+#: src/gtkprefs.c:1734
+#: src/protocols/bonjour/bonjour.c:324
 #: src/protocols/msn/msn.c:552
 #: src/protocols/msn/state.c:32
 #: src/protocols/novell/novell.c:2854
-#: src/protocols/oscar/oscar.c:5185
+#: src/protocols/oscar/oscar.c:5175
 #: src/protocols/yahoo/yahoo.c:2678
-#: src/protocols/yahoo/yahoo_profile.c:691
+#: src/protocols/yahoo/yahoo_profile.c:682
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: src/gtkblist.c:3135
+#: src/gtkblist.c:3134
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporo�ilo ..."
 
-#: src/gtkblist.c:3136
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3135
+#: src/gtkblist.c:3168
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridru転i se pomenku ..."
 
-#: src/gtkblist.c:3137
+#: src/gtkblist.c:3136
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: src/gtkblist.c:3138
+#: src/gtkblist.c:3137
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: src/gtkblist.c:3139
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3138
+#: src/gtkblist.c:3171
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: src/gtkblist.c:3140
+#: src/gtkblist.c:3139
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: src/gtkblist.c:3175
+#: src/gtkblist.c:3174
 msgid "/Tools/Buddy Pounces"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: src/gtkblist.c:3178
+#: src/gtkblist.c:3177
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: src/gtkblist.c:3181
+#: src/gtkblist.c:3180
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: src/gtkblist.c:3375
+#: src/gtkblist.c:3374
 msgid "Manually"
 msgstr "ro�no"
 
-#: src/gtkblist.c:3377
+#: src/gtkblist.c:3376
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: src/gtkblist.c:3378
+#: src/gtkblist.c:3377
 msgid "By status"
 msgstr "po stanju"
 
-#: src/gtkblist.c:3379
+#: src/gtkblist.c:3378
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: src/gtkblist.c:3481
-#: src/gtkconn.c:191
+#: src/gtkblist.c:3480
+#: src/gtkconn.c:197
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: src/gtkblist.c:3503
+#: src/gtkblist.c:3501
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni ve� povezan: %s</span>"
 
-#: src/gtkblist.c:3630
+#: src/gtkblist.c:3648
 msgid "/Accounts"
 msgstr "/Ra�uni"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3735
+#: src/gtkblist.c:3753
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Poka転i prijatelje, ki niso na zvezi"
 
-#: src/gtkblist.c:3738
+#: src/gtkblist.c:3756
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Poka転i prazne skupine"
 
-#: src/gtkblist.c:3744
+#: src/gtkblist.c:3762
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Poka転i podrobnosti prijatelja"
 
-#: src/gtkblist.c:3747
+#: src/gtkblist.c:3765
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Poka転i �ase nedejavnosti"
 
-#: src/gtkblist.c:4456
+#: src/gtkblist.c:4472
 #: src/protocols/silc/buddy.c:736
 #: src/protocols/silc/buddy.c:1030
 #: src/protocols/silc/buddy.c:1075
 #: src/protocols/silc/buddy.c:1174
-#: src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:2923
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: src/gtkblist.c:4480
+#: src/gtkblist.c:4496
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim vnesite ime osebe, ki jo 転elite dodati va邸emu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
 
-#: src/gtkblist.c:4502
+#: src/gtkblist.c:4518
 msgid "Screen Name:"
 msgstr "Ime:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4550
-#: src/gtkblist.c:4869
+#: src/gtkblist.c:4566
+#: src/gtkblist.c:4885
 msgid "Account:"
 msgstr "Ra�un:"
 
-#: src/gtkblist.c:4802
+#: src/gtkblist.c:4818
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: src/gtkblist.c:4818
+#: src/gtkblist.c:4834
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: src/gtkblist.c:4835
+#: src/gtkblist.c:4851
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: src/gtkblist.c:4859
+#: src/gtkblist.c:4875
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga 転elite dodati na seznam prijateljev.\n"
 
-#: src/gtkblist.c:4941
-#: src/protocols/sametime/sametime.c:5220
-#: src/protocols/sametime/sametime.c:5307
+#: src/gtkblist.c:4957
+#: src/protocols/sametime/sametime.c:5206
+#: src/protocols/sametime/sametime.c:5290
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: src/gtkblist.c:4942
+#: src/gtkblist.c:4958
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo 転elite dodati."
 
-#: src/gtkblist.c:5563
+#: src/gtkblist.c:5579
 msgid "_Edit Account"
 msgstr "_Uredi ra�un"
 
-#: src/gtkblist.c:5596
-#: src/gtkblist.c:5602
+#: src/gtkblist.c:5612
+#: src/gtkblist.c:5618
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: src/gtkblist.c:5610
+#: src/gtkblist.c:5626
 msgid "_Disable"
 msgstr "_Onemogo�i"
 
-#: src/gtkblist.c:5622
+#: src/gtkblist.c:5638
 msgid "Enable Account"
 msgstr "Omogo�i ra�un"
 
-#: src/gtkblist.c:5675
+#: src/gtkblist.c:5693
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: src/gtkblist.c:5770
+#: src/gtkblist.c:5788
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
@@ -2964,14 +2821,14 @@
 msgid "Whether combobox dropdowns should look like lists rather than menus"
 msgstr "�e naj bodo roletni meniji kombiniranega polja seznami namesto menijev"
 
-#: src/gtkconn.c:192
+#: src/gtkconn.c:198
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"The account has been disabled. Correct the error and reenable the account to connect."
 msgstr ""
 "%s je bil odjavljen zaradi napake: %s\n"
-"Gaim se ne bo posku邸al ponovno prijaviti, dokler ne odpravite napake in ponovno omogo�ite povezovanje ra�una."
+"Ra�un je bil onemogo�en. Odpravite napako in ponovno omogo�ite povezavanje ra�una."
 
 #: src/gtkconv.c:364
 #, c-format
@@ -3041,14 +2898,14 @@
 msgstr "_Prijatelj:"
 
 #: src/gtkconv.c:888
-#: src/gtksavedstatuses.c:1102
-#: src/gtksavedstatuses.c:1465
+#: src/gtksavedstatuses.c:1081
+#: src/gtksavedstatuses.c:1404
 msgid "_Message:"
 msgstr "_Sporo�ilo:"
 
 #: src/gtkconv.c:945
-#: src/gtkconv.c:2399
-#: src/gtkdebug.c:217
+#: src/gtkconv.c:2406
+#: src/gtkdebug.c:219
 #: src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogo�e odprti."
@@ -3062,273 +2919,273 @@
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: src/gtkconv.c:1093
+#: src/gtkconv.c:1092
 #: src/gtkdebug.c:165
-#: src/gtkdebug.c:678
+#: src/gtkdebug.c:681
 msgid "Find"
 msgstr "Najdi"
 
-#: src/gtkconv.c:1119
+#: src/gtkconv.c:1118
 #: src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_I邸�i:"
 
-#: src/gtkconv.c:1290
+#: src/gtkconv.c:1289
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Za�elo se je bele転enje v dnevnik. Vsa nadaljna sporo�ila pogovora bodo zabele転ena."
 
-#: src/gtkconv.c:1298
+#: src/gtkconv.c:1297
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Bele転enje v dnevnik ustavljeno. Nadaljna sporo�ila pogovora ne bodo zabele転ena."
 
-#: src/gtkconv.c:1578
+#: src/gtkconv.c:1577
 msgid "IM"
 msgstr "Sporo�i"
 
-#: src/gtkconv.c:1584
-#: src/protocols/oscar/oscar.c:648
+#: src/gtkconv.c:1583
+#: src/protocols/oscar/oscar.c:647
 msgid "Send File"
 msgstr "Po邸lji datoteko"
 
-#: src/gtkconv.c:1591
+#: src/gtkconv.c:1590
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: src/gtkconv.c:1594
+#: src/gtkconv.c:1593
 msgid "Ignore"
 msgstr "Prezri"
 
-#: src/gtkconv.c:1600
+#: src/gtkconv.c:1599
 msgid "Info"
 msgstr "Informacije"
 
-#: src/gtkconv.c:1606
+#: src/gtkconv.c:1605
 msgid "Get Away Message"
 msgstr "Sporo�ilo o odsotnosti"
 
-#: src/gtkconv.c:1621
+#: src/gtkconv.c:1620
 msgid "Last said"
 msgstr "Nazadnje re�eno"
 
-#: src/gtkconv.c:2407
+#: src/gtkconv.c:2414
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogo�e shraniti."
 
-#: src/gtkconv.c:2430
+#: src/gtkconv.c:2437
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: src/gtkconv.c:2479
+#: src/gtkconv.c:2486
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2491
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: src/gtkconv.c:2490
+#: src/gtkconv.c:2497
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: src/gtkconv.c:2631
+#: src/gtkconv.c:2638
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: src/gtkconv.c:2633
+#: src/gtkconv.c:2640
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporo�ilo ..."
 
-#: src/gtkconv.c:2638
+#: src/gtkconv.c:2645
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: src/gtkconv.c:2640
+#: src/gtkconv.c:2647
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: src/gtkconv.c:2641
+#: src/gtkconv.c:2648
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: src/gtkconv.c:2643
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Pogovor/Po_�isti pogovor"
-
-#: src/gtkconv.c:2647
-msgid "/Conversation/Se_nd File..."
-msgstr "/Pogovor/_Po邸lji datoteko ..."
-
-#: src/gtkconv.c:2648
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
-
 #: src/gtkconv.c:2650
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Pogovor/Po_�isti pogovor"
+
+#: src/gtkconv.c:2654
+msgid "/Conversation/Se_nd File..."
+msgstr "/Pogovor/_Po邸lji datoteko ..."
+
+#: src/gtkconv.c:2655
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
+
+#: src/gtkconv.c:2657
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: src/gtkconv.c:2652
+#: src/gtkconv.c:2659
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: src/gtkconv.c:2657
+#: src/gtkconv.c:2664
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: src/gtkconv.c:2659
+#: src/gtkconv.c:2666
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: src/gtkconv.c:2661
+#: src/gtkconv.c:2668
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: src/gtkconv.c:2663
+#: src/gtkconv.c:2670
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: src/gtkconv.c:2668
+#: src/gtkconv.c:2675
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: src/gtkconv.c:2670
+#: src/gtkconv.c:2677
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: src/gtkconv.c:2675
+#: src/gtkconv.c:2682
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: src/gtkconv.c:2679
+#: src/gtkconv.c:2686
 msgid "/_Options"
 msgstr "/M_o転nosti"
 
-#: src/gtkconv.c:2680
+#: src/gtkconv.c:2687
 msgid "/Options/Enable _Logging"
 msgstr "/Mo転nosti/Vk_lju�i dnevnik"
 
-#: src/gtkconv.c:2681
+#: src/gtkconv.c:2688
 msgid "/Options/Enable _Sounds"
 msgstr "/Mo転nosti/Vklju�i _zvoke"
 
-#: src/gtkconv.c:2682
+#: src/gtkconv.c:2689
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Mo転nosti/Prika転i ikono prijatelja"
 
-#: src/gtkconv.c:2684
+#: src/gtkconv.c:2691
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Mo転nosti/Prika転i orodno vrstico za _oblikovanje"
 
-#: src/gtkconv.c:2685
+#: src/gtkconv.c:2692
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Mo転nosti/Pr_ika転i �asovne 転ige"
 
-#: src/gtkconv.c:2777
+#: src/gtkconv.c:2784
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prika転i dnevnik ..."
 
-#: src/gtkconv.c:2783
+#: src/gtkconv.c:2790
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Po邸lji datoteko ..."
 
-#: src/gtkconv.c:2787
+#: src/gtkconv.c:2794
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2800
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: src/gtkconv.c:2797
+#: src/gtkconv.c:2804
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:2810
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: src/gtkconv.c:2807
+#: src/gtkconv.c:2814
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2818
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2822
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: src/gtkconv.c:2821
+#: src/gtkconv.c:2828
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2832
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: src/gtkconv.c:2831
+#: src/gtkconv.c:2838
 msgid "/Options/Enable Logging"
 msgstr "/Mo転nosti/Vklju�i dnevnik"
 
-#: src/gtkconv.c:2834
+#: src/gtkconv.c:2841
 msgid "/Options/Enable Sounds"
 msgstr "/Mo転nosti/Vklju�i zvoke"
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2854
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Mo転nosti/Prika転i orodno vrstico za oblikovanje"
 
-#: src/gtkconv.c:2850
+#: src/gtkconv.c:2857
 msgid "/Options/Show Timestamps"
 msgstr "/Mo転nosti/Prika転i �asovne 転ige"
 
-#: src/gtkconv.c:2853
+#: src/gtkconv.c:2860
 msgid "/Options/Show Buddy Icon"
 msgstr "/Mo転nosti/Prika転i ikono prijatelja"
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: src/gtkconv.c:2936
+#: src/gtkconv.c:2942
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3128
 msgid "_Send To"
 msgstr "_Po邸lji k"
 
-#: src/gtkconv.c:3771
+#: src/gtkconv.c:3780
 msgid "_Send"
 msgstr "_Po邸lji"
 
-#: src/gtkconv.c:3824
-#: src/protocols/sametime/sametime.c:3477
+#: src/gtkconv.c:3833
+#: src/protocols/sametime/sametime.c:3472
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3872
+#: src/gtkconv.c:3881
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: src/gtkconv.c:3951
+#: src/gtkconv.c:3960
 msgid "IM the user"
 msgstr "Po邸lji sporo�ilo uporabniku"
 
-#: src/gtkconv.c:3964
+#: src/gtkconv.c:3973
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: src/gtkconv.c:3976
+#: src/gtkconv.c:3985
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: src/gtkconv.c:4942
-#: src/gtkconv.c:5051
+#: src/gtkconv.c:4954
+#: src/gtkconv.c:5063
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3337,93 +3194,93 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: src/gtkconv.c:6516
+#: src/gtkconv.c:6522
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporo�ilo&gt;:  Po邸lji sporo�ilo kot ponavadi, kot �e ne bi uporabljal ukaza."
 
-#: src/gtkconv.c:6519
+#: src/gtkconv.c:6525
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Po邸lji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: src/gtkconv.c:6522
+#: src/gtkconv.c:6528
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razro邸�i &lt;mo転nost&gt;:  Trenutnim pomenkom po邸lji razli�ne informacije o razhro邸�evanju."
 
-#: src/gtkconv.c:6525
+#: src/gtkconv.c:6531
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Po�isti izpisane replike pomenka."
 
-#: src/gtkconv.c:6528
+#: src/gtkconv.c:6534
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomo� &lt;ukaz&gt;:  Pomo� o dolo�enem ukazu."
 
-#: src/gtkconv.c:6687
+#: src/gtkconv.c:6693
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: src/gtkconv.c:6719
+#: src/gtkconv.c:6725
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporo�ila. Ste prepri�ani, da 転elite zapreti okno?"
 
-#: src/gtkconv.c:7523
+#: src/gtkconv.c:7527
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: src/gtkconv.c:7987
+#: src/gtkconv.c:7991
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: src/gtkconv.c:7989
+#: src/gtkconv.c:7993
 msgid "Separate IM and Chat windows"
 msgstr "lo�i okna za klepet in zasebni pomenek"
 
-#: src/gtkconv.c:7991
-#: src/gtkprefs.c:1236
+#: src/gtkconv.c:7995
+#: src/gtkprefs.c:1232
 msgid "New window"
 msgstr "novo okno"
 
-#: src/gtkconv.c:7993
+#: src/gtkconv.c:7997
 msgid "By group"
 msgstr "po skupinah"
 
-#: src/gtkconv.c:7995
+#: src/gtkconv.c:7999
 msgid "By account"
 msgstr "po vrsti ra�una"
 
-#: src/gtkdebug.c:232
+#: src/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Shrani dnevnik razhro邸�evanja"
 
-#: src/gtkdebug.c:586
+#: src/gtkdebug.c:589
 msgid "Invert"
 msgstr "Preobrni"
 
-#: src/gtkdebug.c:589
+#: src/gtkdebug.c:592
 msgid "Highlight matches"
 msgstr "Obarvaj zadetke"
 
-#: src/gtkdebug.c:636
+#: src/gtkdebug.c:639
 msgid "Debug Window"
 msgstr "Razhro邸�evalno okno"
 
-#: src/gtkdebug.c:689
+#: src/gtkdebug.c:692
 msgid "Clear"
 msgstr "Po�isti"
 
-#: src/gtkdebug.c:698
+#: src/gtkdebug.c:701
 msgid "Pause"
 msgstr "Premor"
 
-#: src/gtkdebug.c:705
-#: src/gtkdebug.c:706
+#: src/gtkdebug.c:708
+#: src/gtkdebug.c:709
 msgid "Timestamps"
 msgstr "Prika転i �as"
 
-#: src/gtkdebug.c:724
+#: src/gtkdebug.c:727
 msgid "Filter"
 msgstr "Filter"
 
-#: src/gtkdebug.c:743
+#: src/gtkdebug.c:746
 msgid "Right click for more options."
 msgstr "Za ve� mo転nosti kliknite na desni mi邸kin gumb."
 
@@ -3685,8 +3542,8 @@
 msgstr "O programu Gaim"
 
 #: src/gtkdialogs.c:250
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomo�jo Gtk+.<BR><BR>Program lahko spreminjate in raz邸irjate pod pogoji licence GPL (razli�ice 2 ali novej邸e).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je za邸�itena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakr邸na garancija.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.  You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomo�jo Gtk+. Program lahko spreminjate in raz邸irjate pod pogoji licence GPL (razli�ice 2 ali novej邸e).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je za邸�itena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakr邸na garancija.<BR><BR>"
 
 #: src/gtkdialogs.c:264
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -3945,7 +3802,7 @@
 msgstr "Preostali �as:"
 
 #: src/gtkft.c:708
-#: src/protocols/oscar/oscar.c:8532
+#: src/protocols/oscar/oscar.c:8570
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
@@ -3964,7 +3821,7 @@
 
 #. Pause button
 #: src/gtkft.c:780
-#: src/gtkstock.c:146
+#: src/gtkstock.c:147
 msgid "_Pause"
 msgstr "_Premor"
 
@@ -4009,7 +3866,7 @@
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: src/gtkimhtml.c:3261
+#: src/gtkimhtml.c:3263
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4019,7 +3876,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3264
+#: src/gtkimhtml.c:3266
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4029,7 +3886,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3277
+#: src/gtkimhtml.c:3279
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -4040,7 +3897,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3280
+#: src/gtkimhtml.c:3282
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4051,12 +3908,12 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3360
-#: src/gtkimhtml.c:3372
+#: src/gtkimhtml.c:3362
+#: src/gtkimhtml.c:3374
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: src/gtkimhtml.c:3400
+#: src/gtkimhtml.c:3402
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
@@ -4159,61 +4016,57 @@
 msgid "Insert smiley"
 msgstr "Vstavi sme邸kota"
 
-#: src/gtklog.c:202
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
-
-#: src/gtklog.c:207
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
-
-#: src/gtklog.c:258
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: src/gtklog.c:311
+#: src/gtklog.c:214
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Pomenki v %s o %s"
+
+#: src/gtklog.c:216
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Pomenki z %s o %s"
+
+#: src/gtklog.c:329
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "Sistemski dogodki bodo shranjeni, le �e bo nastavljena mo転nost \"Omogo�i sistemski dnevnik\"."
 
-#: src/gtklog.c:315
+#: src/gtklog.c:333
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "Neposredna sporo�ila se bodo shranila, le �e bo okljukana mo転nost \"Shranjuj vsa neposredna sporo�ila\"."
 
-#: src/gtklog.c:318
+#: src/gtklog.c:336
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana mo転nost \"Shranjuj vse pomenke\"."
 
-#: src/gtklog.c:322
+#: src/gtklog.c:340
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: src/gtklog.c:398
+#: src/gtklog.c:416
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: src/gtklog.c:474
+#: src/gtklog.c:492
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: src/gtklog.c:482
-#: src/gtklog.c:533
+#: src/gtklog.c:500
+#: src/gtklog.c:551
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: src/gtklog.c:558
+#: src/gtklog.c:576
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkmain.c:312
+#: src/gtkmain.c:319
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poskusi '%s -h' za ve� informacij.\n"
 
-#: src/gtkmain.c:314
+#: src/gtkmain.c:321
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4238,39 +4091,51 @@
 "                     dolo�a ra�un(e) za prijavo, lo�ene z vejico)\n"
 "  -v, --version       izpi邸i trenutno razli�ico in kon�aj program\n"
 
-#: src/gtkmain.c:493
-#, c-format
+#: src/gtkmain.c:498
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
+"It is possible that this bug is already fixed in CVS.\n"
 "If you can reproduce the crash, please notify the gaim\n"
 "developers by reporting a bug at\n"
-"%sbug.php\n"
+msgstr ""
+"Gaim se je sesul in poskusil izvre�i datoteko core.\n"
+"To je povzro�il hro邸� v programski opremi in zgodilo\n"
+"se je brez va邸e krivde.\n"
+"\n"
+"Mo転no je, da je ta hro邸� v CVS 転e odpravljen.\n"
+"�e lahko ponovite sesutje, prosimo, obvestite\n"
+"razvijalce gaima s poro�ilom o hro邸�u na naslovu\n"
+
+#: src/gtkmain.c:504
+msgid ""
+"bug.php\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php.  If you need further\n"
+msgstr ""
+"bug.php\n"
+"\n"
+"Preverite, da ste navedli, kaj ste po�eli takrat\n"
+"in da ste oddali obratno sled (\"backtrace\") iz datoteke core.\n"
+"�e ne znate pridobiti obratne sledi, si preberite navodila na naslovu\n"
+
+#: src/gtkmain.c:508
+msgid ""
+"gdb.php.  If you need further\n"
 "assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
 "Contact information for Sean and Luke on other protocols is at\n"
-"%scontactinfo.php.\n"
 msgstr ""
-"Program Gaim se je sesul in pri tem shranil pomnilni邸ki izmet.\n"
-"Gre za hro邸�a v programski opremi in za to sami niste krivi.\n"
-"\n"
-"�e lahko ponovite korake, ki privedejo do sesutja, prosimo,\n"
-"obvestite razvijalce gaima s poro�ilom o hro邸�u na naslovu\n"
-"%sbug.php\n"
-"\n"
-"Ne pozabite navesti, kaj ste takrat po�eli,\n"
-"objavite tudi izsledek iz datoteke pomnilni邸kega izmeta (core).\n"
-"�e ne veste, kako pridobiti izsledek, si preberite navodila na naslovu\n"
-"%sgdb.php.  �e potrebujete dodatno pomo�,\n"
-"to neposredno sporo�ite SeanEgn ali LSchiere (prek AIM).\n"
-"Podatki za stik z Seanom in Lukom prek drugih protokolov so na\n"
-"%scontactinfo.php.\n"
+"gdb.php.  �e potrebujete dodatno\n"
+"podporo, po邸ljite neposredno sporo�ilo na naslov SeanEgn ali LSchiere (prek AIM).\n"
+"Informacije o stikih za Seana in Luka prek drugih protokolov so na naslovu\n"
+
+#: src/gtkmain.c:511
+msgid "contactinfo.php.\n"
+msgstr "contactinfo.php.\n"
 
 #: src/gtkmedia.c:52
 msgid "Call ended."
@@ -4329,7 +4194,7 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste po邸to!</span>"
 
-#: src/gtknotify.c:451
+#: src/gtknotify.c:455
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -4338,7 +4203,7 @@
 msgstr[2] "%s ima %d novi sporo�ili."
 msgstr[3] "%s ima %d nova sporo�ila."
 
-#: src/gtknotify.c:456
+#: src/gtknotify.c:460
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4349,41 +4214,41 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:643
-#: src/protocols/sametime/sametime.c:5360
+#: src/gtknotify.c:645
+#: src/protocols/sametime/sametime.c:5340
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: src/gtknotify.c:799
-#: src/protocols/oscar/oscar.c:4973
+#: src/gtknotify.c:801
+#: src/protocols/oscar/oscar.c:4963
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: src/gtknotify.c:800
+#: src/gtknotify.c:802
 #: src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: src/gtknotify.c:840
+#: src/gtknotify.c:842
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Ukaz brskalnika <b>%s</b> ni veljaven."
 
-#: src/gtknotify.c:842
+#: src/gtknotify.c:844
+#: src/gtknotify.c:856
+#: src/gtknotify.c:869
+#: src/gtknotify.c:994
+msgid "Unable to open URL"
+msgstr "Ni bilo mogo�e odprti URL"
+
 #: src/gtknotify.c:854
 #: src/gtknotify.c:867
-#: src/gtknotify.c:992
-msgid "Unable to open URL"
-msgstr "Ni bilo mogo�e odprti URL"
-
-#: src/gtknotify.c:852
-#: src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Napaka pri zaganjanju <b>%s</b>: %s"
 
-#: src/gtknotify.c:993
+#: src/gtknotify.c:995
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Va邸ega brskalnika ni bilo mogo�e zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
 
@@ -4433,181 +4298,181 @@
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: src/gtkpounce.c:259
+#: src/gtkpounce.c:260
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:504
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:504
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
 #. Create the "Pounce on Whom" frame.
-#: src/gtkpounce.c:520
+#: src/gtkpounce.c:521
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: src/gtkpounce.c:547
+#: src/gtkpounce.c:548
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: src/gtkpounce.c:571
+#: src/gtkpounce.c:572
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
-#: src/gtkpounce.c:579
+#: src/gtkpounce.c:580
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: src/gtkpounce.c:581
+#: src/gtkpounce.c:582
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: src/gtkpounce.c:583
+#: src/gtkpounce.c:584
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: src/gtkpounce.c:585
+#: src/gtkpounce.c:586
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: src/gtkpounce.c:587
+#: src/gtkpounce.c:588
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: src/gtkpounce.c:589
+#: src/gtkpounce.c:590
 msgid "Is no longer i_dle"
 msgstr "ni ve_� nedejaven."
 
-#: src/gtkpounce.c:591
+#: src/gtkpounce.c:592
 msgid "Starts _typing"
 msgstr "za�ne _tipkati"
 
-#: src/gtkpounce.c:593
+#: src/gtkpounce.c:594
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: src/gtkpounce.c:595
+#: src/gtkpounce.c:596
 msgid "Sends a _message"
 msgstr "Po邸lje spo_ro�ilo"
 
 #. Create the "Action" frame.
-#: src/gtkpounce.c:627
+#: src/gtkpounce.c:628
 msgid "Action"
 msgstr "Dejanje"
 
-#: src/gtkpounce.c:635
+#: src/gtkpounce.c:636
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporo�ilno okno"
 
-#: src/gtkpounce.c:637
+#: src/gtkpounce.c:638
 msgid "_Pop up a notification"
 msgstr "_Prika転i obvestilo"
 
-#: src/gtkpounce.c:639
+#: src/gtkpounce.c:640
 msgid "Send a _message"
 msgstr "Po邸lji spo_ro�ilo"
 
-#: src/gtkpounce.c:641
+#: src/gtkpounce.c:642
 msgid "E_xecute a command"
 msgstr "Izvr_邸i ukaz"
 
-#: src/gtkpounce.c:643
+#: src/gtkpounce.c:644
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: src/gtkpounce.c:648
+#: src/gtkpounce.c:649
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: src/gtkpounce.c:650
+#: src/gtkpounce.c:651
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: src/gtkpounce.c:651
+#: src/gtkpounce.c:652
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
 #. Create the "Options" frame.
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:764
 msgid "Options"
 msgstr "Mo転nosti"
 
-#: src/gtkpounce.c:771
+#: src/gtkpounce.c:772
 msgid "P_ounce only when my status is not available"
 msgstr "_Opozori le tedaj, ko moje stanje ni na voljo"
 
-#: src/gtkpounce.c:776
+#: src/gtkpounce.c:777
 msgid "_Recurring"
 msgstr "Ponavl_jajo�"
 
-#: src/gtkpounce.c:1089
+#: src/gtkpounce.c:1090
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepri�ani, da 転elite izbrisati obvestilo o %s za %s?"
 
-#: src/gtkpounce.c:1237
+#: src/gtkpounce.c:1238
 msgid "Pounce Target"
 msgstr "Tar�a opozorila"
 
-#: src/gtkpounce.c:1272
+#: src/gtkpounce.c:1273
 msgid "Recurring"
 msgstr "Ponavljajo�"
 
-#: src/gtkpounce.c:1319
+#: src/gtkpounce.c:1320
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: src/gtkpounce.c:1446
+#: src/gtkpounce.c:1449
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je za�el pisati"
 
-#: src/gtkpounce.c:1448
+#: src/gtkpounce.c:1451
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: src/gtkpounce.c:1450
+#: src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: src/gtkpounce.c:1452
+#: src/gtkpounce.c:1455
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: src/gtkpounce.c:1454
+#: src/gtkpounce.c:1457
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: src/gtkpounce.c:1456
+#: src/gtkpounce.c:1459
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: src/gtkpounce.c:1458
+#: src/gtkpounce.c:1461
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: src/gtkpounce.c:1460
+#: src/gtkpounce.c:1463
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: src/gtkpounce.c:1462
+#: src/gtkpounce.c:1465
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporo�ilo. (%s)"
 
-#: src/gtkpounce.c:1463
+#: src/gtkpounce.c:1466
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poro�ajte o tem!"
 
@@ -4635,7 +4500,7 @@
 msgstr "Skrij nove po_govore IM"
 
 #: src/gtkprefs.c:817
-#: src/gtkprefs.c:1757
+#: src/gtkprefs.c:1753
 msgid "When away"
 msgstr "ob odsotnosti"
 
@@ -4717,8 +4582,8 @@
 msgstr "N_ovi pogovori:"
 
 #: src/gtkprefs.c:966
-#: src/protocols/oscar/oscar.c:803
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:802
+#: src/protocols/oscar/oscar.c:6129
 msgid "IP Address"
 msgstr "Naslov IP"
 
@@ -4734,99 +4599,99 @@
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: src/gtkprefs.c:1007
+#: src/gtkprefs.c:1003
 msgid "Ports"
 msgstr "Vrata"
 
-#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:1006
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ro�no dolo�i obseg vrat za poslu邸anje"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1009
 msgid "_Start port:"
 msgstr "_Za�etna vrata:"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1016
 msgid "_End port:"
 msgstr "_Kon�na vrata:"
 
+#: src/gtkprefs.c:1024
+msgid "Proxy Server"
+msgstr "Stre転nik proxy"
+
 #: src/gtkprefs.c:1028
-msgid "Proxy Server"
-msgstr "Stre転nik proxy"
-
-#: src/gtkprefs.c:1032
 msgid "No proxy"
 msgstr "Brez stre転nika proxy"
 
-#: src/gtkprefs.c:1088
+#: src/gtkprefs.c:1084
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1146
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1151
+#: src/gtkprefs.c:1147
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1148
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1153
+#: src/gtkprefs.c:1149
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1154
+#: src/gtkprefs.c:1150
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1151
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1156
+#: src/gtkprefs.c:1152
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1157
+#: src/gtkprefs.c:1153
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1154
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1167
+#: src/gtkprefs.c:1163
 msgid "Manual"
 msgstr "Ro�ni"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1216
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1220
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: src/gtkprefs.c:1232
+#: src/gtkprefs.c:1228
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: src/gtkprefs.c:1234
+#: src/gtkprefs.c:1230
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1231
 msgid "Existing window"
 msgstr "Obstoje�e okno"
 
-#: src/gtkprefs.c:1237
+#: src/gtkprefs.c:1233
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: src/gtkprefs.c:1251
+#: src/gtkprefs.c:1247
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4835,85 +4700,85 @@
 "_Ro�no:\n"
 "(%s namesto URL)"
 
-#: src/gtkprefs.c:1287
-#: src/gtkprefs.c:1868
+#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1864
 msgid "Logging"
 msgstr "Bele転enje v dnevnik"
 
-#: src/gtkprefs.c:1290
+#: src/gtkprefs.c:1286
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: src/gtkprefs.c:1295
+#: src/gtkprefs.c:1291
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporo�ila"
 
-#: src/gtkprefs.c:1297
+#: src/gtkprefs.c:1293
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1295
 msgid "Log all _status changes to system log"
 msgstr "Bele転i vse spremembe _stanja v sistemski dnevnik"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1443
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1451
 msgid "Quietest"
 msgstr "najti邸je"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1453
 msgid "Quieter"
 msgstr "ti邸je"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1455
 msgid "Quiet"
 msgstr "tiho"
 
-#: src/gtkprefs.c:1461
+#: src/gtkprefs.c:1457
 #: src/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Navadno"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1459
 msgid "Loud"
 msgstr "glasno"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1461
 msgid "Louder"
 msgstr "glasneje"
 
-#: src/gtkprefs.c:1467
+#: src/gtkprefs.c:1463
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: src/gtkprefs.c:1530
+#: src/gtkprefs.c:1526
 msgid "Sound Method"
 msgstr "Na�in zvoka"
 
-#: src/gtkprefs.c:1531
+#: src/gtkprefs.c:1527
 msgid "_Method:"
 msgstr "_Na�in:"
 
-#: src/gtkprefs.c:1533
+#: src/gtkprefs.c:1529
 msgid "Console beep"
 msgstr "Pisk"
 
-#: src/gtkprefs.c:1535
+#: src/gtkprefs.c:1531
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/gtkprefs.c:1540
+#: src/gtkprefs.c:1536
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/gtkprefs.c:1541
+#: src/gtkprefs.c:1537
 msgid "No sounds"
 msgstr "Nemo"
 
-#: src/gtkprefs.c:1549
+#: src/gtkprefs.c:1545
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4922,114 +4787,114 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: src/gtkprefs.c:1575
+#: src/gtkprefs.c:1571
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: src/gtkprefs.c:1576
+#: src/gtkprefs.c:1572
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: src/gtkprefs.c:1578
+#: src/gtkprefs.c:1574
 msgid "_Sounds while away"
 msgstr "_Zvoki, kadar sem odsoten"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1581
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: src/gtkprefs.c:1613
+#: src/gtkprefs.c:1609
 msgid "Sound Events"
 msgstr "Zvo�ni Dogodki"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1660
 msgid "Play"
 msgstr "Predvajaj"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1667
 msgid "Event"
 msgstr "Dogodek"
 
+#: src/gtkprefs.c:1686
+msgid "Test"
+msgstr "Preskus"
+
 #: src/gtkprefs.c:1690
-msgid "Test"
-msgstr "Preskus"
-
-#: src/gtkprefs.c:1694
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: src/gtkprefs.c:1698
+#: src/gtkprefs.c:1694
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: src/gtkprefs.c:1740
+#: src/gtkprefs.c:1736
 msgid "_Report idle time:"
 msgstr "_Poro�aj o �asu odsotnosti:"
 
-#: src/gtkprefs.c:1743
+#: src/gtkprefs.c:1739
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporo�ila"
 
-#: src/gtkprefs.c:1745
+#: src/gtkprefs.c:1741
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali mi邸ke"
 
-#: src/gtkprefs.c:1754
+#: src/gtkprefs.c:1750
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1754
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: src/gtkprefs.c:1764
+#: src/gtkprefs.c:1760
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: src/gtkprefs.c:1766
+#: src/gtkprefs.c:1762
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: src/gtkprefs.c:1770
+#: src/gtkprefs.c:1766
 msgid "_Minutes before changing status:"
 msgstr "�tevilo _minut pred spremembo stanja:"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1774
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: src/gtkprefs.c:1799
+#: src/gtkprefs.c:1795
 msgid "Status at startup"
 msgstr "Stanje ob zagonu"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1797
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1803
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: src/gtkprefs.c:1858
+#: src/gtkprefs.c:1854
 msgid "Smiley Themes"
 msgstr "Teme za sme邸ke"
 
-#: src/gtkprefs.c:1859
+#: src/gtkprefs.c:1855
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: src/gtkprefs.c:1860
+#: src/gtkprefs.c:1856
 #: src/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Omre転je"
 
-#: src/gtkprefs.c:1865
+#: src/gtkprefs.c:1861
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: src/gtkprefs.c:1869
+#: src/gtkprefs.c:1865
 msgid "Away / Idle"
 msgstr "Odsotnost / Nedejavnost"
 
@@ -5053,71 +4918,71 @@
 msgid "Block only the users below"
 msgstr "Zavrni samo uporabnike spodaj"
 
-#: src/gtkprivacy.c:372
+#: src/gtkprivacy.c:371
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/gtkprivacy.c:385
+#: src/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Spremembe nastavitev o zasebnosti stopijo v veljavo takoj."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:397
+#: src/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
+#: src/gtkprivacy.c:561
+#: src/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "Dovoli uporabniku"
+
 #: src/gtkprivacy.c:562
-#: src/gtkprivacy.c:578
-msgid "Permit User"
-msgstr "Dovoli uporabniku"
-
-#: src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Vpi邸ite uporabnika, ki mu 転eli邸 dovoliti, da stopi v stik z vami."
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:563
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Prosim vnesite ime uporabnika, ki mu 転elite omogo�iti, da stopi v stik z vami"
 
-#: src/gtkprivacy.c:567
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:566
+#: src/gtkprivacy.c:579
 msgid "_Permit"
 msgstr "_Dovoli"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dovoli %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepri�ani, da 転elite dovoliti %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:601
-#: src/gtkprivacy.c:614
+#: src/gtkprivacy.c:600
+#: src/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:601
 msgid "Type a user to block."
 msgstr "Vpi邸ite uporabnika, ki ga 転elite zavrniti."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:602
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga 転elite zavrniti."
 
-#: src/gtkprivacy.c:605
-#: src/gtkprivacy.c:616
+#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:615
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Zavrnem %s?"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepri�ani, da 転elite zavrniti %s?"
@@ -5195,22 +5060,22 @@
 msgid "_Add Chat"
 msgstr "_Dodaj pomenek"
 
-#: src/gtksavedstatuses.c:446
+#: src/gtksavedstatuses.c:436
 #: src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:812
 #: src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Naziv"
 
-#: src/gtksavedstatuses.c:461
+#: src/gtksavedstatuses.c:451
 msgid "Type"
 msgstr "Vrsta"
 
 #. Available status messages are plain text
-#: src/gtksavedstatuses.c:472
-#: src/gtksavedstatuses.c:917
-#: src/protocols/bonjour/bonjour.c:256
-#: src/protocols/bonjour/bonjour.c:263
+#: src/gtksavedstatuses.c:462
+#: src/gtksavedstatuses.c:907
+#: src/protocols/bonjour/bonjour.c:247
+#: src/protocols/bonjour/bonjour.c:254
 #: src/protocols/gg/gg.c:1421
 #: src/protocols/gg/gg.c:1431
 #: src/protocols/gg/gg.c:1437
@@ -5227,43 +5092,43 @@
 #: src/protocols/novell/novell.c:2974
 #: src/protocols/novell/novell.c:2980
 #: src/protocols/novell/novell.c:2986
-#: src/protocols/oscar/oscar.c:7709
-#: src/protocols/oscar/oscar.c:7723
-#: src/protocols/oscar/oscar.c:7728
-#: src/protocols/oscar/oscar.c:7937
-#: src/protocols/oscar/oscar.c:7949
-#: src/protocols/sametime/sametime.c:3221
-#: src/protocols/sametime/sametime.c:3227
-#: src/protocols/sametime/sametime.c:3233
-#: src/protocols/sametime/sametime.c:3312
+#: src/protocols/oscar/oscar.c:7747
+#: src/protocols/oscar/oscar.c:7761
+#: src/protocols/oscar/oscar.c:7766
+#: src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:7987
+#: src/protocols/sametime/sametime.c:3220
+#: src/protocols/sametime/sametime.c:3226
+#: src/protocols/sametime/sametime.c:3232
+#: src/protocols/sametime/sametime.c:3309
 #: src/protocols/silc/buddy.c:1544
-#: src/protocols/simple/simple.c:241
-#: src/protocols/yahoo/yahoo.c:3227
-#: src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/simple/simple.c:252
+#: src/protocols/yahoo/yahoo.c:3225
+#: src/protocols/yahoo/yahoo.c:3231
 #: src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Sporo�ilo"
 
-#: src/gtksavedstatuses.c:535
+#: src/gtksavedstatuses.c:525
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
 #. Use button
-#: src/gtksavedstatuses.c:560
-#: src/gtksavedstatuses.c:1178
+#: src/gtksavedstatuses.c:550
+#: src/gtksavedstatuses.c:1154
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: src/gtksavedstatuses.c:688
+#: src/gtksavedstatuses.c:662
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je 転e v uporabi. Prosimo, izberite drug naziv."
 
-#: src/gtksavedstatuses.c:876
+#: src/gtksavedstatuses.c:866
 msgid "Different"
 msgstr "Razno"
 
-#: src/gtksavedstatuses.c:906
-#: src/gtksavedstatuses.c:1044
+#: src/gtksavedstatuses.c:896
+#: src/gtksavedstatuses.c:1023
 #: src/protocols/gg/gg.c:1403
 #: src/protocols/gg/gg.c:1408
 #: src/protocols/jabber/buddy.c:623
@@ -5273,33 +5138,33 @@
 #: src/protocols/msn/msn.c:550
 #: src/protocols/novell/novell.c:2867
 #: src/protocols/novell/novell.c:2871
-#: src/protocols/oscar/oscar.c:783
-#: src/protocols/oscar/oscar.c:789
-#: src/protocols/oscar/oscar.c:792
-#: src/protocols/yahoo/yahoo.c:2829
+#: src/protocols/oscar/oscar.c:782
+#: src/protocols/oscar/oscar.c:788
+#: src/protocols/oscar/oscar.c:791
+#: src/protocols/yahoo/yahoo.c:2827
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gtksavedstatuses.c:1063
+#: src/gtksavedstatuses.c:1042
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: src/gtksavedstatuses.c:1083
-#: src/gtksavedstatuses.c:1430
+#: src/gtksavedstatuses.c:1062
+#: src/gtksavedstatuses.c:1369
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: src/gtksavedstatuses.c:1120
+#: src/gtksavedstatuses.c:1097
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere ra�une uporabi _razli�no stanje"
 
 #. Save & Use button
-#: src/gtksavedstatuses.c:1187
+#: src/gtksavedstatuses.c:1163
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: src/gtksavedstatuses.c:1407
+#: src/gtksavedstatuses.c:1348
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
@@ -5358,111 +5223,115 @@
 msgid "Unable to play sound because the configured sound command could not be launched: %s"
 msgstr "Zvoka ni bilo mogo�e predvajati, ker izbranega ukaza za zvok ni bilo mogo�e pognati: %s"
 
-#: src/gtkstatusbox.c:362
+#: src/gtkstatusbox.c:336
 msgid "Typing"
 msgstr "Tipka"
 
 #. connect to the server
-#: src/gtkstatusbox.c:364
+#: src/gtkstatusbox.c:339
 #: src/protocols/irc/irc.c:256
 #: src/protocols/jabber/jabber.c:893
 #: src/protocols/msn/session.c:349
 #: src/protocols/napster/napster.c:531
 #: src/protocols/novell/novell.c:2183
-#: src/protocols/oscar/oscar.c:1861
-#: src/protocols/sametime/sametime.c:3598
-#: src/protocols/simple/simple.c:1368
+#: src/protocols/oscar/oscar.c:1860
+#: src/protocols/sametime/sametime.c:3592
+#: src/protocols/simple/simple.c:1344
 #: src/protocols/yahoo/yahoo.c:2524
 #: src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/gtkstatusbox.c:668
+#: src/gtkstatusbox.c:583
 msgid "New..."
 msgstr "Novo ..."
 
-#: src/gtkstatusbox.c:669
+#: src/gtkstatusbox.c:584
 msgid "Saved..."
 msgstr "Datoteka shranjena ..."
 
-#: src/gtkstock.c:138
+#: src/gtkstock.c:139
 msgid "_Alias"
 msgstr "_Psevdonim"
 
-#: src/gtkstock.c:140
+#: src/gtkstock.c:141
 msgid "Close _tabs"
 msgstr "Zapri _zavihke"
 
-#: src/gtkstock.c:142
+#: src/gtkstock.c:143
 msgid "_Get Info"
 msgstr "_Informacije"
 
-#: src/gtkstock.c:143
-msgid "_Invite"
-msgstr "Povab_i"
-
 #: src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Spremeni"
+msgid "_Invite"
+msgstr "Povab_i"
 
 #: src/gtkstock.c:145
+msgid "_Modify"
+msgstr "_Spremeni"
+
+#: src/gtkstock.c:146
 msgid "_Open Mail"
 msgstr "_Odpri po邸to"
 
-#: src/gtkutils.c:1313
-#: src/gtkutils.c:1338
+#: src/gtkstock.c:148
+msgid "_Warn"
+msgstr "_Opozori"
+
+#: src/gtkutils.c:1311
+#: src/gtkutils.c:1336
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je pri邸lo do neznane napake: %s"
 
-#: src/gtkutils.c:1315
-#: src/gtkutils.c:1340
+#: src/gtkutils.c:1313
+#: src/gtkutils.c:1338
 msgid "Failed to load image"
 msgstr "Slike ni mogo�e odpreti"
 
-#: src/gtkutils.c:1415
+#: src/gtkutils.c:1413
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogo�e poslati imenika %s."
 
-#: src/gtkutils.c:1417
+#: src/gtkutils.c:1415
 msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
 msgstr "Gaim ne more prenesti imenika. Datoteke boste morali poslati posami�no."
 
-#: src/gtkutils.c:1445
-#: src/gtkutils.c:1454
-#: src/gtkutils.c:1459
+#: src/gtkutils.c:1443
+#: src/gtkutils.c:1452
+#: src/gtkutils.c:1457
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: src/gtkutils.c:1446
+#: src/gtkutils.c:1444
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali uporabite kot ikono za tega uporabnika."
 
-#: src/gtkutils.c:1450
-#: src/gtkutils.c:1465
+#: src/gtkutils.c:1448
+#: src/gtkutils.c:1463
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: src/gtkutils.c:1451
-#: src/gtkutils.c:1466
+#: src/gtkutils.c:1449
+#: src/gtkutils.c:1464
 msgid "Send image file"
 msgstr "Po邸lji slikovno datoteko"
 
-#: src/gtkutils.c:1452
-#: src/gtkutils.c:1466
+#: src/gtkutils.c:1450
+#: src/gtkutils.c:1464
 msgid "Insert in message"
 msgstr "Vstavi v sporo�ilo"
 
-#: src/gtkutils.c:1455
+#: src/gtkutils.c:1453
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo 転elite nastaviti za ikono prijatelja?"
 
+#: src/gtkutils.c:1458
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali jo uporabite kot ikono za tega uporabnika."
+
 #: src/gtkutils.c:1460
-msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
-msgstr "To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali jo uporabite kot ikono za tega uporabnika."
-
-#: src/gtkutils.c:1462
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "To sliko lahko vstavite v to sporo�ilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
@@ -5471,11 +5340,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1516
+#: src/gtkutils.c:1514
 msgid "Cannot send launcher"
 msgstr "Ni mogo�e poslati zaganjalnika"
 
-#: src/gtkutils.c:1516
+#: src/gtkutils.c:1514
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste 転eleli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik ka転e."
 
@@ -5487,115 +5356,115 @@
 msgid "Sent Doodle request."
 msgstr "Po邸lji zahtevo Doodle."
 
-#: src/log.c:158
+#: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Bele転enje nima mo転nosti branja</font></b>"
 
-#: src/log.c:540
+#: src/log.c:511
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:551
+#: src/log.c:522
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: src/log.c:562
+#: src/log.c:533
 msgid "Old Gaim"
 msgstr "Stari Gaim"
 
-#: src/log.c:653
+#: src/log.c:628
 msgid "Logging of this conversation failed."
 msgstr "Bele転enje tega pogovora v dnevnik ni uspelo."
 
-#: src/log.c:946
+#: src/log.c:896
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:1014
+#: src/log.c:960
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:1016
+#: src/log.c:962
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:1073
-#: src/log.c:1195
+#: src/log.c:1013
+#: src/log.c:1132
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogo�e najti poti do dnevnika!</b></font>"
 
-#: src/log.c:1085
-#: src/log.c:1207
+#: src/log.c:1025
+#: src/log.c:1144
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogo�e brati datoteke: %s</b></font>"
 
-#: src/log.c:1138
+#: src/log.c:1077
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/plugin.c:281
+#: src/plugin.c:278
 #: src/protocols/msn/servconn.c:133
 #: src/protocols/msn/session.c:326
-#: src/protocols/oscar/oscar.c:5040
+#: src/protocols/oscar/oscar.c:5030
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: src/plugin.c:424
+#: src/plugin.c:421
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Neustrezna %d vstavka (potrebuje %d)"
 
-#: src/plugin.c:441
+#: src/plugin.c:438
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Neustrezna razli�ica ABI %d.%d.x (potrebna je %d.%d.x)"
 
-#: src/plugin.c:457
+#: src/plugin.c:454
 msgid "Plugin does not implement all required functions"
 msgstr "Vstavek ne vsebuje implementacije vseh potrebnih funkcij"
 
-#: src/plugin.c:512
+#: src/plugin.c:509
 #, c-format
 msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
 
-#: src/plugin.c:517
+#: src/plugin.c:514
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Ob nalaganju vstavka je pri邸lo do napak."
 
-#: src/plugin.c:540
+#: src/plugin.c:537
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega dodatka %s se ni dalo nalo転iti."
 
-#: src/plugin.c:544
+#: src/plugin.c:541
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ni mogel nalo転iti va邸ega dodatka."
 
-#: src/plugin.c:646
+#: src/plugin.c:643
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Odvisnega vstavka %s ni bilo mogo�e odlo転iti."
 
-#: src/plugin.c:651
+#: src/plugin.c:648
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Pri odlaganju vstavka je pri邸lo do napake."
 
 #. Send a message about the connection error
-#: src/protocols/bonjour/bonjour.c:111
+#: src/protocols/bonjour/bonjour.c:107
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Dohodnim povezavam IM ni mogo�e prisluhniti\n"
 
-#: src/protocols/bonjour/bonjour.c:146
+#: src/protocols/bonjour/bonjour.c:142
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Povezave s krajevnim stre転nikom mDNS ni mogo�e vzpostaviti. Ali je stre転nik sploh zagnan?"
 
-#: src/protocols/bonjour/bonjour.c:337
-#: src/protocols/sametime/sametime.c:3198
+#: src/protocols/bonjour/bonjour.c:328
+#: src/protocols/sametime/sametime.c:3197
 #, c-format
 msgid ""
 "\n"
@@ -5604,7 +5473,7 @@
 "\n"
 "<b>Stanje</b>: %s"
 
-#: src/protocols/bonjour/bonjour.c:339
+#: src/protocols/bonjour/bonjour.c:330
 #, c-format
 msgid ""
 "\n"
@@ -5623,53 +5492,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:434
-#: src/protocols/bonjour/bonjour.c:436
+#: src/protocols/bonjour/bonjour.c:425
+#: src/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Dodatek za protokol Bonjour"
 
-#: src/protocols/bonjour/bonjour.c:468
-#: src/protocols/bonjour/bonjour.c:476
-#: src/protocols/bonjour/bonjour.c:534
+#: src/protocols/bonjour/bonjour.c:459
+#: src/protocols/bonjour/bonjour.c:516
 msgid "Gaim User"
 msgstr "Uporabnik Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:572
+#: src/protocols/bonjour/bonjour.c:554
 #: src/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
 #. Creating the options for the protocol
 #. port to connect to
-#: src/protocols/bonjour/bonjour.c:576
+#: src/protocols/bonjour/bonjour.c:558
 #: src/protocols/irc/irc.c:829
-#: src/protocols/msn/msn.c:1957
+#: src/protocols/msn/msn.c:1948
 #: src/protocols/napster/napster.c:720
-#: src/protocols/sametime/sametime.c:5544
+#: src/protocols/sametime/sametime.c:5520
 #: src/protocols/silc/silc.c:1856
 msgid "Port"
 msgstr "Vrata"
 
-#: src/protocols/bonjour/bonjour.c:579
+#: src/protocols/bonjour/bonjour.c:561
 #: src/protocols/gg/gg.c:562
 #: src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "Ime"
 
-#: src/protocols/bonjour/bonjour.c:582
+#: src/protocols/bonjour/bonjour.c:564
 #: src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "Priimek"
 
-#: src/protocols/bonjour/bonjour.c:585
+#: src/protocols/bonjour/bonjour.c:567
 #: src/protocols/jabber/buddy.c:261
 #: src/protocols/jabber/buddy.c:779
 #: src/protocols/jabber/buddy.c:787
 #: src/protocols/silc/silc.c:695
 #: src/protocols/silc/silc.c:935
 #: src/protocols/silc/util.c:512
-#: src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/yahoo/yahoo_profile.c:1021
 msgid "Email"
 msgstr "Elektronska po邸ta"
 
@@ -5801,15 +5669,15 @@
 #: src/protocols/silc/ops.c:1036
 #: src/protocols/silc/ops.c:1179
 #: src/protocols/silc/ops.c:1328
-#: src/protocols/yahoo/yahoo_profile.c:1035
+#: src/protocols/yahoo/yahoo_profile.c:1026
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #: src/protocols/gg/gg.c:572
 #: src/protocols/gg/gg.c:977
 #: src/protocols/jabber/jabber.c:716
-#: src/protocols/oscar/oscar.c:6138
-#: src/protocols/oscar/oscar.c:6146
+#: src/protocols/oscar/oscar.c:6176
+#: src/protocols/oscar/oscar.c:6184
 msgid "City"
 msgstr "Kraj"
 
@@ -5818,9 +5686,9 @@
 msgstr "Leto rojstva"
 
 #: src/protocols/gg/gg.c:580
-#: src/protocols/msn/msn.c:1538
-#: src/protocols/oscar/oscar.c:6112
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/msn/msn.c:1529
+#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Gender"
 msgstr "Spol"
 
@@ -5829,12 +5697,12 @@
 msgstr "Mo邸ki ali 転enska"
 
 #: src/protocols/gg/gg.c:582
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6149
 msgid "Male"
 msgstr "Mo邸ki"
 
 #: src/protocols/gg/gg.c:583
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6149
 msgid "Female"
 msgstr "貼enska"
 
@@ -5905,12 +5773,12 @@
 
 #: src/protocols/gg/gg.c:962
 #: src/protocols/gg/gg.c:1029
-#: src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:6287
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogo�e izpisati."
 
 #: src/protocols/gg/gg.c:968
-#: src/protocols/oscar/oscar.c:6084
+#: src/protocols/oscar/oscar.c:6121
 msgid "UIN"
 msgstr "UIN"
 
@@ -6117,17 +5985,17 @@
 msgstr "Podpora SSL ni na voljo"
 
 #: src/protocols/irc/irc.c:275
-#: src/protocols/simple/simple.c:422
-#: src/protocols/simple/simple.c:1296
+#: src/protocols/simple/simple.c:403
+#: src/protocols/simple/simple.c:1272
 msgid "Couldn't create socket"
 msgstr "Vti�nice ni bilo mogo�e ustvariti"
 
 #: src/protocols/irc/irc.c:346
 #: src/protocols/jabber/jabber.c:354
-#: src/protocols/oscar/oscar.c:1789
-#: src/protocols/oscar/oscar.c:1857
+#: src/protocols/oscar/oscar.c:1788
+#: src/protocols/oscar/oscar.c:1856
 msgid "Couldn't connect to host"
-msgstr "Povezava do gostitelja ni uspela"
+msgstr "Nisem se mogel povezati do gostitelja"
 
 #: src/protocols/irc/irc.c:371
 #: src/protocols/jabber/jabber.c:381
@@ -6151,7 +6019,7 @@
 msgstr "Uporabniki"
 
 #: src/protocols/irc/irc.c:696
-#: src/protocols/sametime/sametime.c:3309
+#: src/protocols/sametime/sametime.c:3306
 #: src/protocols/silc/chat.c:1423
 #: src/protocols/silc/ops.c:1380
 #: src/protocols/yahoo/yahoochat.c:1406
@@ -6180,10 +6048,10 @@
 #: src/protocols/irc/msgs.c:231
 #: src/protocols/jabber/jabber.c:1788
 #: src/protocols/napster/napster.c:715
-#: src/protocols/sametime/sametime.c:5539
+#: src/protocols/sametime/sametime.c:5515
 #: src/protocols/silc/ops.c:1242
 #: src/protocols/silc/ops.c:1344
-#: src/protocols/simple/simple.c:1527
+#: src/protocols/simple/simple.c:1497
 msgid "Server"
 msgstr "Stre転nik"
 
@@ -6241,7 +6109,7 @@
 msgstr "<b>%s:</b> %s"
 
 #: src/protocols/irc/msgs.c:211
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6122
 #: src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Vzdevek"
@@ -6258,7 +6126,7 @@
 #: src/protocols/irc/msgs.c:225
 #: src/protocols/irc/msgs.c:226
 #: src/protocols/irc/msgs.c:237
-#: src/protocols/yahoo/yahoo_profile.c:691
+#: src/protocols/yahoo/yahoo_profile.c:682
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
@@ -6266,7 +6134,7 @@
 #: src/protocols/irc/msgs.c:226
 #: src/protocols/silc/ops.c:1183
 #: src/protocols/silc/ops.c:1332
-#: src/protocols/yahoo/yahoo_profile.c:1040
+#: src/protocols/yahoo/yahoo_profile.c:1031
 msgid "Realname"
 msgstr "Pravo ime"
 
@@ -6284,143 +6152,143 @@
 msgid "Online since"
 msgstr "Prijavljen od"
 
-#: src/protocols/irc/msgs.c:248
+#: src/protocols/irc/msgs.c:247
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Ukrasni pridevek:</b> Supersploh<br>"
 
-#: src/protocols/irc/msgs.c:316
+#: src/protocols/irc/msgs.c:315
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s je spremenil temo kanala na: %s"
 
-#: src/protocols/irc/msgs.c:321
+#: src/protocols/irc/msgs.c:320
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema za kanal %s je: %s"
 
-#: src/protocols/irc/msgs.c:338
+#: src/protocols/irc/msgs.c:337
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznano sporo�ilo '%s'"
 
-#: src/protocols/irc/msgs.c:339
+#: src/protocols/irc/msgs.c:338
 msgid "Unknown message"
 msgstr "Neznano sporo�ilo"
 
-#: src/protocols/irc/msgs.c:339
+#: src/protocols/irc/msgs.c:338
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim je poslal sporo�ilo, ki ga IRC stre転nik ni prepoznal."
 
-#: src/protocols/irc/msgs.c:362
+#: src/protocols/irc/msgs.c:361
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: src/protocols/irc/msgs.c:490
+#: src/protocols/irc/msgs.c:489
 msgid "Time Response"
 msgstr "�asovni odziv"
 
-#: src/protocols/irc/msgs.c:491
+#: src/protocols/irc/msgs.c:490
 msgid "The IRC server's local time is:"
 msgstr "Krajevni �as stre転nika IRC je:"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:501
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:512
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: src/protocols/irc/msgs.c:516
+#: src/protocols/irc/msgs.c:515
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: src/protocols/irc/msgs.c:521
+#: src/protocols/irc/msgs.c:520
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: src/protocols/irc/msgs.c:541
+#: src/protocols/irc/msgs.c:540
 msgid "Could not send"
 msgstr "Ni bilo mogo�e poslati"
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridru転evanje kanalu %s zahteva povabilo."
 
-#: src/protocols/irc/msgs.c:598
+#: src/protocols/irc/msgs.c:597
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: src/protocols/irc/msgs.c:699
+#: src/protocols/irc/msgs.c:698
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: src/protocols/irc/msgs.c:704
+#: src/protocols/irc/msgs.c:703
 #: src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: src/protocols/irc/msgs.c:727
+#: src/protocols/irc/msgs.c:726
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "na�in (%s %s) nastavil %s"
 
+#: src/protocols/irc/msgs.c:811
 #: src/protocols/irc/msgs.c:812
-#: src/protocols/irc/msgs.c:813
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: src/protocols/irc/msgs.c:814
+#: src/protocols/irc/msgs.c:813
 msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "Va邸 izbrani vzdevek je stre転nik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: src/protocols/irc/msgs.c:818
+#: src/protocols/irc/msgs.c:817
 msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "Va邸e izbrano ime ra�una je stre転nik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:857
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:857
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogo�e spremeniti"
 
-#: src/protocols/irc/msgs.c:879
+#: src/protocols/irc/msgs.c:878
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: src/protocols/irc/msgs.c:921
+#: src/protocols/irc/msgs.c:920
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor stre転nika"
 
-#: src/protocols/irc/msgs.c:923
+#: src/protocols/irc/msgs.c:922
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: src/protocols/irc/msgs.c:998
+#: src/protocols/irc/msgs.c:997
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridru転iti %s:"
 
-#: src/protocols/irc/msgs.c:999
+#: src/protocols/irc/msgs.c:998
 #: src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridru転iti kanalu"
 
-#: src/protocols/irc/msgs.c:1033
+#: src/protocols/irc/msgs.c:1032
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: src/protocols/irc/msgs.c:1045
+#: src/protocols/irc/msgs.c:1044
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mo�ni udarci od %s"
@@ -6569,7 +6437,7 @@
 
 #: src/protocols/irc/parse.c:542
 #: src/protocols/irc/parse.c:546
-#: src/protocols/oscar/oscar.c:1698
+#: src/protocols/oscar/oscar.c:1697
 #: src/protocols/toc/toc.c:190
 #: src/protocols/toc/toc.c:688
 #: src/protocols/toc/toc.c:704
@@ -6710,7 +6578,7 @@
 
 #: src/protocols/jabber/buddy.c:266
 #: src/protocols/jabber/buddy.c:698
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6157
 msgid "Birthday"
 msgstr "Rojstni dan"
 
@@ -6735,8 +6603,8 @@
 
 #: src/protocols/jabber/buddy.c:718
 #: src/protocols/jabber/jabber.c:711
-#: src/protocols/oscar/oscar.c:6137
-#: src/protocols/oscar/oscar.c:6145
+#: src/protocols/oscar/oscar.c:6175
+#: src/protocols/oscar/oscar.c:6183
 #: src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
@@ -6797,9 +6665,9 @@
 
 #: src/protocols/jabber/buddy.c:1109
 #: src/protocols/jabber/jabber.c:1133
-#: src/protocols/oscar/oscar.c:721
-#: src/protocols/oscar/oscar.c:7966
-#: src/protocols/sametime/sametime.c:3232
+#: src/protocols/oscar/oscar.c:720
+#: src/protocols/oscar/oscar.c:8004
+#: src/protocols/sametime/sametime.c:3231
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
@@ -6813,14 +6681,14 @@
 
 #: src/protocols/jabber/buddy.c:1385
 #: src/protocols/jabber/jabber.c:701
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6132
 #: src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
 #: src/protocols/jabber/buddy.c:1390
 #: src/protocols/jabber/jabber.c:706
-#: src/protocols/oscar/oscar.c:6096
+#: src/protocols/oscar/oscar.c:6133
 msgid "Last Name"
 msgstr "Priimek"
 
@@ -6850,7 +6718,7 @@
 msgstr "Imenik iskanja"
 
 #: src/protocols/jabber/chat.c:41
-#: src/protocols/oscar/oscar.c:7461
+#: src/protocols/oscar/oscar.c:7499
 #: src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Soba:"
@@ -6994,8 +6862,8 @@
 msgstr "E-po邸ta"
 
 #: src/protocols/jabber/jabber.c:721
-#: src/protocols/oscar/oscar.c:6139
-#: src/protocols/oscar/oscar.c:6147
+#: src/protocols/oscar/oscar.c:6177
+#: src/protocols/oscar/oscar.c:6185
 msgid "State"
 msgstr "Zvezna dr転ava"
 
@@ -7036,8 +6904,8 @@
 #: src/protocols/jabber/jabber.c:1347
 #: src/protocols/jabber/jabber.c:1388
 #: src/protocols/jabber/jabber.c:1422
-#: src/protocols/oscar/oscar.c:790
-#: src/protocols/oscar/oscar.c:7756
+#: src/protocols/oscar/oscar.c:789
+#: src/protocols/oscar/oscar.c:7794
 msgid "Not Authorized"
 msgstr "Nepoobla邸�eno"
 
@@ -7096,14 +6964,14 @@
 msgstr "Vnesite svoje novo geslo"
 
 #: src/protocols/jabber/jabber.c:1241
-#: src/protocols/oscar/oscar.c:8390
+#: src/protocols/oscar/oscar.c:8428
 #: src/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/jabber/jabber.c:1246
-#: src/protocols/oscar/oscar.c:8401
+#: src/protocols/oscar/oscar.c:8439
 #: src/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
@@ -7407,7 +7275,7 @@
 msgstr "Dovoli overovitev z navadnim besedilom preko ne邸ifriranih toka"
 
 #: src/protocols/jabber/jabber.c:1812
-#: src/protocols/simple/simple.c:1533
+#: src/protocols/simple/simple.c:1503
 msgid "Connect port"
 msgstr "Pove転i vrata"
 
@@ -7461,14 +7329,14 @@
 msgstr "Uporabnik %s 転eli dodati %s na svoj seznam prijateljev."
 
 #: src/protocols/jabber/presence.c:319
-#: src/protocols/oscar/oscar.c:4717
-#: src/protocols/oscar/oscar.c:7391
+#: src/protocols/oscar/oscar.c:4707
+#: src/protocols/oscar/oscar.c:7429
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
 #: src/protocols/jabber/presence.c:320
-#: src/protocols/oscar/oscar.c:4719
-#: src/protocols/oscar/oscar.c:7392
+#: src/protocols/oscar/oscar.c:4709
+#: src/protocols/oscar/oscar.c:7430
 msgid "_Deny"
 msgstr "_Zavrni"
 
@@ -7499,13 +7367,13 @@
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridru転evanju pomenku %s"
 
-#: src/protocols/jabber/si.c:626
+#: src/protocols/jabber/si.c:619
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ni mogo�e poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
 
-#: src/protocols/jabber/si.c:627
-#: src/protocols/jabber/si.c:628
+#: src/protocols/jabber/si.c:620
+#: src/protocols/jabber/si.c:621
 msgid "File Send Failed"
 msgstr "Po邸iljanje datoteke ni uspelo"
 
@@ -7622,7 +7490,7 @@
 msgstr "Preve� zadetkov za FND"
 
 #: src/protocols/msn/error.c:112
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:205
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -7717,7 +7585,7 @@
 msgstr "Stre転nik preve� zaposlen"
 
 #: src/protocols/msn/error.c:198
-#: src/protocols/oscar/oscar.c:2847
+#: src/protocols/oscar/oscar.c:2837
 #: src/protocols/silc/ops.c:1717
 #: src/protocols/toc/toc.c:722
 msgid "Authentication failed"
@@ -7812,9 +7680,9 @@
 #: src/protocols/msn/msn.c:550
 #: src/protocols/msn/msn.c:557
 #: src/protocols/msn/msn.c:566
-#: src/protocols/sametime/sametime.c:3194
-#: src/protocols/yahoo/yahoo.c:2829
-#: src/protocols/yahoo/yahoo.c:2835
+#: src/protocols/sametime/sametime.c:3193
+#: src/protocols/yahoo/yahoo.c:2827
+#: src/protocols/yahoo/yahoo.c:2833
 #, c-format
 msgid ""
 "\n"
@@ -7830,7 +7698,7 @@
 #: src/protocols/msn/msn.c:587
 #: src/protocols/msn/state.c:33
 #: src/protocols/yahoo/yahoo.c:2658
-#: src/protocols/yahoo/yahoo.c:3237
+#: src/protocols/yahoo/yahoo.c:3235
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
@@ -7841,19 +7709,19 @@
 #: src/protocols/silc/buddy.c:1473
 #: src/protocols/silc/silc.c:53
 #: src/protocols/yahoo/yahoo.c:2660
-#: src/protocols/yahoo/yahoo.c:3240
+#: src/protocols/yahoo/yahoo.c:3238
 msgid "Busy"
 msgstr "Zaposlen"
 
 #: src/protocols/msn/msn.c:595
 #: src/protocols/yahoo/yahoo.c:2668
-#: src/protocols/yahoo/yahoo.c:3252
+#: src/protocols/yahoo/yahoo.c:3250
 msgid "On the Phone"
 msgstr "Na telefonu"
 
 #: src/protocols/msn/msn.c:599
 #: src/protocols/yahoo/yahoo.c:2672
-#: src/protocols/yahoo/yahoo.c:3258
+#: src/protocols/yahoo/yahoo.c:3256
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
@@ -7903,7 +7771,7 @@
 msgstr "Povezava na stre転nik neuspe邸na."
 
 #: src/protocols/msn/msn.c:1366
-#: src/protocols/yahoo/yahoo_profile.c:685
+#: src/protocols/yahoo/yahoo_profile.c:676
 #: src/protocols/zephyr/zephyr.c:721
 #: src/protocols/zephyr/zephyr.c:1136
 #, c-format
@@ -7912,95 +7780,95 @@
 
 #. put a link to the actual profile URL
 #: src/protocols/msn/msn.c:1373
-#: src/protocols/msn/msn.c:1725
-#: src/protocols/yahoo/yahoo_profile.c:1202
-#: src/util.c:915
+#: src/protocols/msn/msn.c:1716
+#: src/protocols/yahoo/yahoo_profile.c:1193
+#: src/util.c:790
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1456
+#: src/protocols/msn/msn.c:1447
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1461
-#: src/protocols/msn/msn.c:1712
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: src/protocols/msn/msn.c:1452
+#: src/protocols/msn/msn.c:1703
+#: src/protocols/yahoo/yahoo_profile.c:786
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: src/protocols/msn/msn.c:1531
-#: src/protocols/oscar/oscar.c:6124
-#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/msn/msn.c:1522
+#: src/protocols/oscar/oscar.c:6162
+#: src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Age"
 msgstr "Starost"
 
-#: src/protocols/msn/msn.c:1547
-#: src/protocols/yahoo/yahoo_profile.c:1055
+#: src/protocols/msn/msn.c:1538
+#: src/protocols/yahoo/yahoo_profile.c:1046
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: src/protocols/msn/msn.c:1554
+#: src/protocols/msn/msn.c:1545
 #: src/protocols/novell/novell.c:1480
-#: src/protocols/yahoo/yahoo_profile.c:1045
+#: src/protocols/yahoo/yahoo_profile.c:1036
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/protocols/msn/msn.c:1562
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/msn/msn.c:1553
+#: src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: src/protocols/msn/msn.c:1579
-#: src/protocols/msn/msn.c:1585
-#: src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607
+#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1576
+#: src/protocols/msn/msn.c:1583
+#: src/protocols/msn/msn.c:1591
+#: src/protocols/msn/msn.c:1598
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: src/protocols/msn/msn.c:1616
-#: src/protocols/msn/msn.c:1622
-#: src/protocols/msn/msn.c:1629
-#: src/protocols/msn/msn.c:1636
+#: src/protocols/msn/msn.c:1607
+#: src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1627
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: src/protocols/msn/msn.c:1645
-#: src/protocols/msn/msn.c:1651
-#: src/protocols/msn/msn.c:1658
+#: src/protocols/msn/msn.c:1636
+#: src/protocols/msn/msn.c:1642
+#: src/protocols/msn/msn.c:1649
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: src/protocols/msn/msn.c:1667
-#: src/protocols/msn/msn.c:1673
-#: src/protocols/yahoo/yahoo_profile.c:1107
+#: src/protocols/msn/msn.c:1658
+#: src/protocols/msn/msn.c:1664
+#: src/protocols/yahoo/yahoo_profile.c:1098
 msgid "Favorite Quote"
 msgstr "Najljub邸i citat"
 
-#: src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1672
 msgid "Last Updated"
 msgstr "Nazadnje osve転eno"
 
-#: src/protocols/msn/msn.c:1692
+#: src/protocols/msn/msn.c:1683
 #: src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Doma�a stran"
 
-#: src/protocols/msn/msn.c:1714
+#: src/protocols/msn/msn.c:1705
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1715
+#: src/protocols/msn/msn.c:1706
 msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
 msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa 邸e ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1710
 msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
 msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
 
-#: src/protocols/msn/msn.c:1725
-#: src/protocols/yahoo/yahoo_profile.c:1202
+#: src/protocols/msn/msn.c:1716
+#: src/protocols/yahoo/yahoo_profile.c:1193
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -8014,24 +7882,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1931
-#: src/protocols/msn/msn.c:1933
+#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "MSN Protocol Plugin"
 msgstr "Vstavek za protokol MSN"
 
-#: src/protocols/msn/msn.c:1952
+#: src/protocols/msn/msn.c:1943
 msgid "Login server"
 msgstr "Prijavni stre転nik"
 
-#: src/protocols/msn/msn.c:1961
+#: src/protocols/msn/msn.c:1952
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: src/protocols/msn/msn.c:1966
+#: src/protocols/msn/msn.c:1957
 msgid "Show custom smileys"
 msgstr "Poka転i sme邸ke po meri ..."
 
-#: src/protocols/msn/msn.c:1974
+#: src/protocols/msn/msn.c:1965
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -8150,7 +8018,7 @@
 #. Looks like someone logged in as us! =-O
 #: src/protocols/msn/session.c:312
 #: src/protocols/napster/napster.c:456
-#: src/protocols/oscar/oscar.c:5801
+#: src/protocols/oscar/oscar.c:5791
 #: src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
@@ -8210,35 +8078,31 @@
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: src/protocols/msn/switchboard.c:407
+#: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Sporo�ila morda ni bilo poslano, ker je pri邸lo do �asovne prekora�itve:"
 
-#: src/protocols/msn/switchboard.c:415
+#: src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporo�ila ni mogo�e poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: src/protocols/msn/switchboard.c:419
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporo�ila ni mogo�e poslati, saj uporabnik ni na zvezi:"
 
-#: src/protocols/msn/switchboard.c:423
+#: src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporo�ilo ni bilo poslano, ker je pri邸lo do napake v povezavi:"
 
-#: src/protocols/msn/switchboard.c:427
-msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Sporo�ila ni mogo�e poslati, saj je poslano prehitro:"
-
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:425
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporo�ila ni bilo poslano, ker je pri邸lo do napake v stikalni plo邸�i:"
 
-#: src/protocols/msn/switchboard.c:439
+#: src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporo�ila morda ni bilo poslano, ker je pri邸lo do neznane napake:"
 
-#: src/protocols/msn/switchboard.c:960
+#: src/protocols/msn/switchboard.c:954
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal me転ik!"
@@ -8268,12 +8132,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
 
-#: src/protocols/msn/userlist.c:678
+#: src/protocols/msn/userlist.c:670
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogo�e dodati."
 
-#: src/protocols/msn/userlist.c:680
+#: src/protocols/msn/userlist.c:672
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
@@ -8573,8 +8437,8 @@
 msgstr "StojPo邸ta"
 
 #: src/protocols/novell/novell.c:1490
-#: src/protocols/oscar/oscar.c:6098
-#: src/protocols/oscar/oscar.c:6105
+#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6142
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
@@ -8686,463 +8550,459 @@
 msgid "Server port"
 msgstr "Vrata stre転nika"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
+#: src/protocols/oscar/oscar.c:202
+msgid "Invalid SNAC"
+msgstr "Neveljaven SNAC"
+
 #: src/protocols/oscar/oscar.c:203
-msgid "Invalid SNAC"
-msgstr "Neveljaven SNAC"
-
-#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to client"
 msgstr "Prenos do odjemalca"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:206
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:207
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:208
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:209
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
+#: src/protocols/oscar/oscar.c:210
+msgid "Not supported by client"
+msgstr "Odjemalec ne podpira"
+
 #: src/protocols/oscar/oscar.c:211
-msgid "Not supported by client"
-msgstr "Odjemalec ne podpira"
+msgid "Refused by client"
+msgstr "Odjemalec je zavrnil"
 
 #: src/protocols/oscar/oscar.c:212
-msgid "Refused by client"
-msgstr "Odjemalec je zavrnil"
+msgid "Reply too big"
+msgstr "Odgovor prevelik"
 
 #: src/protocols/oscar/oscar.c:213
-msgid "Reply too big"
-msgstr "Odgovor prevelik"
-
-#: src/protocols/oscar/oscar.c:214
 msgid "Responses lost"
 msgstr "Odgovori so se izgubili"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:214
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:215
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:216
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
+#: src/protocols/oscar/oscar.c:217
+msgid "In local permit/deny"
+msgstr "V lokalnem dovoljenju/prepovedi"
+
 #: src/protocols/oscar/oscar.c:218
-msgid "In local permit/deny"
-msgstr "V lokalnem dovoljenju/prepovedi"
+msgid "Too evil (sender)"
+msgstr "Preve� zloben (po邸iljatelj)"
 
 #: src/protocols/oscar/oscar.c:219
-msgid "Too evil (sender)"
-msgstr "Preve� zloben (po邸iljatelj)"
+msgid "Too evil (receiver)"
+msgstr "Preve� zloben (prejemnik)"
 
 #: src/protocols/oscar/oscar.c:220
-msgid "Too evil (receiver)"
-msgstr "Preve� zloben (prejemnik)"
-
-#: src/protocols/oscar/oscar.c:221
 msgid "User temporarily unavailable"
 msgstr "Uporabnik za�asno ni dostopen"
 
-#: src/protocols/oscar/oscar.c:222
+#: src/protocols/oscar/oscar.c:221
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: src/protocols/oscar/oscar.c:223
+#: src/protocols/oscar/oscar.c:222
 msgid "List overflow"
 msgstr "Prekora�itev seznama"
 
-#: src/protocols/oscar/oscar.c:224
+#: src/protocols/oscar/oscar.c:223
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
+#: src/protocols/oscar/oscar.c:224
+msgid "Queue full"
+msgstr "�akalna vrsta je polna"
+
 #: src/protocols/oscar/oscar.c:225
-msgid "Queue full"
-msgstr "�akalna vrsta je polna"
-
-#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr "Na omre転ju AOL ni dovoljeno"
 
-#: src/protocols/oscar/oscar.c:420
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:521
 msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
 msgstr "(Pri邸lo je do napake pri prejemu tega sporo�ila. Prijatelj, s katerim se pogovarjate, ima verjetno hro邸�astega odjemalca.)"
 
-#: src/protocols/oscar/oscar.c:636
+#: src/protocols/oscar/oscar.c:635
 msgid "Voice"
 msgstr "Glasovno"
 
-#: src/protocols/oscar/oscar.c:639
+#: src/protocols/oscar/oscar.c:638
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:641
 #: src/protocols/silc/silc.c:693
 #: src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Pomenek"
 
-#: src/protocols/oscar/oscar.c:645
-#: src/protocols/oscar/oscar.c:8081
+#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:8119
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:651
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:654
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: src/protocols/oscar/oscar.c:658
+#: src/protocols/oscar/oscar.c:657
 msgid "Send Buddy List"
 msgstr "Po邸lji seznam prijateljev"
 
-#: src/protocols/oscar/oscar.c:661
+#: src/protocols/oscar/oscar.c:660
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: src/protocols/oscar/oscar.c:664
+#: src/protocols/oscar/oscar.c:663
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: src/protocols/oscar/oscar.c:667
+#: src/protocols/oscar/oscar.c:666
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:670
+#: src/protocols/oscar/oscar.c:669
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:673
+#: src/protocols/oscar/oscar.c:672
 msgid "ICQ Server Relay"
 msgstr "ICQ stre転ni邸ki posrednik"
 
-#: src/protocols/oscar/oscar.c:676
+#: src/protocols/oscar/oscar.c:675
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:681
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:685
+#: src/protocols/oscar/oscar.c:684
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:687
 msgid "Security Enabled"
 msgstr "Varnost vklju�ena"
 
-#: src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:690
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: src/protocols/oscar/oscar.c:695
+#: src/protocols/oscar/oscar.c:694
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:698
+#: src/protocols/oscar/oscar.c:697
 msgid "Live Video"
 msgstr "Video v 転ivo"
 
-#: src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:700
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:719
-#: src/protocols/oscar/oscar.c:7943
+#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:7981
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: src/protocols/oscar/oscar.c:723
-#: src/protocols/oscar/oscar.c:7971
+#: src/protocols/oscar/oscar.c:722
+#: src/protocols/oscar/oscar.c:8009
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: src/protocols/oscar/oscar.c:725
-#: src/protocols/oscar/oscar.c:7961
+#: src/protocols/oscar/oscar.c:724
+#: src/protocols/oscar/oscar.c:7999
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:728
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:732
 msgid "Online"
 msgstr "Prisoten"
 
-#: src/protocols/oscar/oscar.c:810
-#: src/protocols/oscar/oscar.c:5165
+#: src/protocols/oscar/oscar.c:809
+#: src/protocols/oscar/oscar.c:5155
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: src/protocols/oscar/oscar.c:819
+#: src/protocols/oscar/oscar.c:818
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:970
+#: src/protocols/oscar/oscar.c:969
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredni pogovor z %s kon�an"
 
-#: src/protocols/oscar/oscar.c:972
+#: src/protocols/oscar/oscar.c:971
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredni pogovor z %s ni bil uspe邸en"
 
-#: src/protocols/oscar/oscar.c:980
+#: src/protocols/oscar/oscar.c:979
 msgid "Direct Connect failed"
 msgstr "Neposredna povezava spodletela"
 
-#: src/protocols/oscar/oscar.c:1057
-#: src/protocols/oscar/oscar.c:1188
+#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1187
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredni pogovor z %s vzpostavljen"
 
-#: src/protocols/oscar/oscar.c:1138
+#: src/protocols/oscar/oscar.c:1137
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Poskus povezave z %s pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1544
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spra邸evanje %s za povezavo na nas pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1549
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1548
+#: src/protocols/oscar/oscar.c:1595
 msgid "Unable to open Direct IM"
 msgstr "Neposredne povezave ni bilo mogo�e vzpostaviti"
 
-#: src/protocols/oscar/oscar.c:1632
+#: src/protocols/oscar/oscar.c:1631
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: src/protocols/oscar/oscar.c:1636
+#: src/protocols/oscar/oscar.c:1635
 msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
 msgstr "Ker to razkrije va邸 IP naslov, se to obravnava kot kr邸enje zasebnosti. Ali 転elite nadaljevati?"
 
-#: src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:1639
+#: src/protocols/oscar/oscar.c:4466
 msgid "_Connect"
 msgstr "_Pove転i"
 
-#: src/protocols/oscar/oscar.c:1706
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: src/protocols/oscar/oscar.c:1729
+#: src/protocols/oscar/oscar.c:1728
 msgid "Chat is currently unavailable"
 msgstr "Pomenek tenutno ni na voljo"
 
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1798
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: src/protocols/oscar/oscar.c:1815
+#: src/protocols/oscar/oscar.c:1814
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Prijava ni mogo�a: ni se mogo�e prijaviti kot %s, ker je vzdevek neveljaven. Vzdevki se morajo za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in presledke, lahko pa so tudi sestavljeni iz samih 邸tevil."
 
-#: src/protocols/oscar/oscar.c:1844
+#: src/protocols/oscar/oscar.c:1843
 msgid "Unable to login to AIM"
-msgstr "Povezava na AIM ni uspela"
-
-#: src/protocols/oscar/oscar.c:1948
-#: src/protocols/oscar/oscar.c:2938
+msgstr "Nisem se mogel povezati na AIM"
+
+#: src/protocols/oscar/oscar.c:1947
+#: src/protocols/oscar/oscar.c:2928
 msgid "Could Not Connect"
-msgstr "Povezava ni uspela"
-
-#: src/protocols/oscar/oscar.c:1956
+msgstr "Nisem se mogel povezati"
+
+#: src/protocols/oscar/oscar.c:1955
 msgid "Connection established, cookie sent"
 msgstr "Povezava vzpostavljena, pi邸kotek poslan"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2115
+#: src/protocols/oscar/oscar.c:2107
 msgid "Attempting connection redirect..."
 msgstr "Poskus preusmeritve povezave ..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2161
+#. * stage 1/2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2152
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account->Advanced."
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
 msgstr ""
 "Prenos datoteke %s je prekora�il �as.\n"
-"Poskusite omogo�iti stre転nike prehoda za prenos datotek v Ra�uni -> %s -> Uredi ra�un -> Napredno."
-
-#: src/protocols/oscar/oscar.c:2259
+"Poskusite omogo�iti stre転nike proxy za prenos datotek vOrodja -> Nastavitve -> AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:2250
 #: src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogo�e vzpostaviti."
 
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2255
 msgid "Unable to create new connection."
 msgstr "Ni bilo mogo�e vzpostaviti nove povezave."
 
+#: src/protocols/oscar/oscar.c:2489
 #: src/protocols/oscar/oscar.c:2498
-#: src/protocols/oscar/oscar.c:2507
-#: src/protocols/oscar/oscar.c:2521
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2522
 msgid "Unable to log into file transfer proxy."
 msgstr "Prijava v proxy prenosa datotek ni bila mogo�a."
 
-#: src/protocols/oscar/oscar.c:2585
+#: src/protocols/oscar/oscar.c:2576
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "Vti�nice za poslu邸anje ni bilo mogo�e vzpostaviti ali pa povezava prehoda AOL ni prisotna."
 
-#: src/protocols/oscar/oscar.c:2824
+#: src/protocols/oscar/oscar.c:2814
 #: src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Neveljaven vzdevek ali geslo."
 
-#: src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:2819
 msgid "Your account is currently suspended."
 msgstr "Va邸 ra�un je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2823
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporo�il je trenuno nedosegljiva."
 
-#: src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:2828
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Povezava ste preve�krat vzpostavili in prekinili. Po�akajte deset minut in poskusite ponovno. �e ne po�akate sedaj, boste �akali 邸e dalj."
 
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2833
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Razli�ica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
 
-#: src/protocols/oscar/oscar.c:2874
+#: src/protocols/oscar/oscar.c:2864
 msgid "Internal Error"
 msgstr "Interna napaka"
 
-#: src/protocols/oscar/oscar.c:2945
+#: src/protocols/oscar/oscar.c:2935
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: src/protocols/oscar/oscar.c:2969
+#: src/protocols/oscar/oscar.c:2959
 msgid "The SecurID key entered is invalid."
 msgstr "Vne邸eni klju� SecurID ni veljaven."
 
-#: src/protocols/oscar/oscar.c:2983
+#: src/protocols/oscar/oscar.c:2973
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2974
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite 邸tevilo s 6 ciframi iz digitalnega prikazovalnika."
 
-#: src/protocols/oscar/oscar.c:3024
-#: src/protocols/oscar/oscar.c:3054
-#: src/protocols/oscar/oscar.c:3143
+#: src/protocols/oscar/oscar.c:3014
+#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3133
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Morda boste 転eleli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
 
-#: src/protocols/oscar/oscar.c:3027
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3017
+#: src/protocols/oscar/oscar.c:3047
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvle�ka za AIM."
 
-#: src/protocols/oscar/oscar.c:3146
+#: src/protocols/oscar/oscar.c:3136
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvle�ka."
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3157
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: src/protocols/oscar/oscar.c:4467
+#: src/protocols/oscar/oscar.c:4457
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s je pravkar prosil za neposredno povezavo z %s"
 
-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:4460
 msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
 msgstr "To zahteva neposredno povezavo med dvema ra�unalnikoma in je za vstavljene slike nujno potrebno. Ker bo izdan va邸 IP naslov, je to lahko tveganje varnosti."
 
-#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4499
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4517
+#: src/protocols/oscar/oscar.c:4507
 msgid "Authorization Request Message:"
 msgstr "Sporo�ilo o zahtevi po pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4508
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: src/protocols/oscar/oscar.c:4548
+#: src/protocols/oscar/oscar.c:4538
 #, c-format
 msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali 転elite poslati zahtevo po pooblastilu?"
 
-#: src/protocols/oscar/oscar.c:4553
+#: src/protocols/oscar/oscar.c:4543
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4555
+#: src/protocols/oscar/oscar.c:4545
 msgid "_Request Authorization"
 msgstr "_Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4593
-#: src/protocols/oscar/oscar.c:4599
-#: src/protocols/oscar/oscar.c:4703
-#: src/protocols/oscar/oscar.c:4727
-#: src/protocols/oscar/oscar.c:7377
-#: src/protocols/oscar/oscar.c:7429
+#: src/protocols/oscar/oscar.c:4583
+#: src/protocols/oscar/oscar.c:4589
+#: src/protocols/oscar/oscar.c:4693
+#: src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:7415
+#: src/protocols/oscar/oscar.c:7467
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: src/protocols/oscar/oscar.c:4598
+#: src/protocols/oscar/oscar.c:4588
 msgid "Authorization Denied Message:"
 msgstr "Sporo�ilo o neodobrenem pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4705
+#: src/protocols/oscar/oscar.c:4695
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9151,12 +9011,12 @@
 "Uporabnik %u 転eli dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4715
-#: src/protocols/oscar/oscar.c:7389
+#: src/protocols/oscar/oscar.c:4705
+#: src/protocols/oscar/oscar.c:7427
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: src/protocols/oscar/oscar.c:4727
+#: src/protocols/oscar/oscar.c:4717
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -9165,17 +9025,17 @@
 "Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4728
+#: src/protocols/oscar/oscar.c:4718
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4735
+#: src/protocols/oscar/oscar.c:4725
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4743
+#: src/protocols/oscar/oscar.c:4733
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9188,7 +9048,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4751
+#: src/protocols/oscar/oscar.c:4741
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9201,7 +9061,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4749
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9214,20 +9074,20 @@
 "Sporo�ilo je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:4770
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4786
+#: src/protocols/oscar/oscar.c:4776
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali 転elite dodati prijatelja s to vizitko na va邸 seznam prijateljev?"
 
-#: src/protocols/oscar/oscar.c:4790
+#: src/protocols/oscar/oscar.c:4780
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4864
 #, 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."
@@ -9236,7 +9096,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4873
 #, 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."
@@ -9245,7 +9105,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:4882
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -9254,7 +9114,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4891
 #, 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."
@@ -9263,7 +9123,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4900
 #, 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."
@@ -9272,7 +9132,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4919
+#: src/protocols/oscar/oscar.c:4909
 #, 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."
@@ -9281,146 +9141,146 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4978
+#: src/protocols/oscar/oscar.c:4968
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC je izvrgel napako: %s\n"
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:5076
+#: src/protocols/oscar/oscar.c:5066
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni mo� poslati sporo�ila: %s"
 
-#: src/protocols/oscar/oscar.c:5076
-#: src/protocols/oscar/oscar.c:5081
-#: src/protocols/oscar/oscar.c:5139
-#: src/protocols/oscar/oscar.c:5143
+#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5133
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: src/protocols/oscar/oscar.c:5079
-#: src/protocols/sametime/sametime.c:2322
+#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/sametime/sametime.c:2321
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni mo� poslati sporo�ila k %s:"
 
-#: src/protocols/oscar/oscar.c:5139
+#: src/protocols/oscar/oscar.c:5129
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5132
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: src/protocols/oscar/oscar.c:5169
+#: src/protocols/oscar/oscar.c:5159
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: src/protocols/oscar/oscar.c:5174
-#: src/protocols/yahoo/yahoo_profile.c:1153
+#: src/protocols/oscar/oscar.c:5164
+#: src/protocols/yahoo/yahoo_profile.c:1144
 msgid "Member Since"
 msgstr "�lan od"
 
-#: src/protocols/oscar/oscar.c:5179
+#: src/protocols/oscar/oscar.c:5169
 msgid "Capabilities"
 msgstr "Zmo転nosti"
 
-#: src/protocols/oscar/oscar.c:5197
+#: src/protocols/oscar/oscar.c:5187
 msgid "Available Message"
 msgstr "Sporo�ilo o dosegljivosti"
 
-#: src/protocols/oscar/oscar.c:5314
+#: src/protocols/oscar/oscar.c:5304
 msgid "Your AIM connection may be lost."
 msgstr "Va邸a povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5500
+#: src/protocols/oscar/oscar.c:5490
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogo�e prikazati sporo�ila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: src/protocols/oscar/oscar.c:5726
+#: src/protocols/oscar/oscar.c:5716
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporo�il."
 
-#: src/protocols/oscar/oscar.c:5727
+#: src/protocols/oscar/oscar.c:5717
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga 転eleli izvesti, ni bilo mogo�e izvesti, ker ste prekora�ili dovoljeno pogostost. Prosim po�akajte 10 sekund in poskusite znova."
 
-#: src/protocols/oscar/oscar.c:5803
+#: src/protocols/oscar/oscar.c:5793
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: src/protocols/oscar/oscar.c:5816
+#: src/protocols/oscar/oscar.c:5806
 #: src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5845
+#: src/protocols/oscar/oscar.c:5835
 msgid "Finalizing connection"
 msgstr "Dokon�ujem povezavo"
 
-#: src/protocols/oscar/oscar.c:6110
+#: src/protocols/oscar/oscar.c:6147
 #: src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/oscar/oscar.c:6165
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: src/protocols/oscar/oscar.c:6131
+#: src/protocols/oscar/oscar.c:6169
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6174
 msgid "Home Address"
 msgstr "Doma�i naslov"
 
-#: src/protocols/oscar/oscar.c:6140
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6186
 msgid "Zip Code"
 msgstr "Po邸tna 邸tevilka"
 
-#: src/protocols/oscar/oscar.c:6144
+#: src/protocols/oscar/oscar.c:6182
 msgid "Work Address"
 msgstr "Slu転beni naslov"
 
-#: src/protocols/oscar/oscar.c:6152
+#: src/protocols/oscar/oscar.c:6190
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:6191
 msgid "Company"
 msgstr "Podjetje"
 
-#: src/protocols/oscar/oscar.c:6154
+#: src/protocols/oscar/oscar.c:6192
 msgid "Division"
 msgstr "Oddelek"
 
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:6193
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6195
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6253
 msgid "Pop-Up Message"
 msgstr "Pojavno sporo�ilo"
 
-#: src/protocols/oscar/oscar.c:6255
+#: src/protocols/oscar/oscar.c:6293
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -9429,60 +9289,60 @@
 msgstr[2] "Naslednja vzdevka sta povezana z %s"
 msgstr[3] "Naslednji vzdevki so povezani z %s"
 
-#: src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6324
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
 
-#: src/protocols/oscar/oscar.c:6307
+#: src/protocols/oscar/oscar.c:6345
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Prejeti bi morali elektronsko po邸to, da potrdite %s. "
 
-#: src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6347
 msgid "Account Confirmation Requested"
 msgstr "Potrditev ra�una je bila zahtevana"
 
-#: src/protocols/oscar/oscar.c:6340
+#: src/protocols/oscar/oscar.c:6378
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o ra�unu"
 
-#: src/protocols/oscar/oscar.c:6343
+#: src/protocols/oscar/oscar.c:6381
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker se zahtevano poimenovanje razlikuje od izvirnega."
 
-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6384
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je neveljavno."
 
-#: src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6387
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je zahtevano poimenovanje predolgo."
 
-#: src/protocols/oscar/oscar.c:6352
+#: src/protocols/oscar/oscar.c:6390
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: Ni bilo mogo�e spremeniti elektronskega naslova, ker je 転e en zahtevek v �akanju za to ime."
 
-#: src/protocols/oscar/oscar.c:6355
+#: src/protocols/oscar/oscar.c:6393
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker ima podan naslov 転e preve� ra�unov."
 
-#: src/protocols/oscar/oscar.c:6358
+#: src/protocols/oscar/oscar.c:6396
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker je podan naslov neveljaven."
 
-#: src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6399
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: src/protocols/oscar/oscar.c:6371
+#: src/protocols/oscar/oscar.c:6409
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9491,29 +9351,29 @@
 "Va邸e ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6372
-#: src/protocols/oscar/oscar.c:6379
+#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6417
 msgid "Account Info"
 msgstr "Podatki o ra�unu"
 
-#: src/protocols/oscar/oscar.c:6377
+#: src/protocols/oscar/oscar.c:6415
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: src/protocols/oscar/oscar.c:6449
+#: src/protocols/oscar/oscar.c:6487
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Va邸a slika IM ni bila poslana. Za po邸iljanje slik IM morate biti \"neposredno povezani\"."
 
-#: src/protocols/oscar/oscar.c:6687
+#: src/protocols/oscar/oscar.c:6725
 msgid "Unable to set AIM profile."
 msgstr "Ni mogo�e nastaviti AIM profila."
 
-#: src/protocols/oscar/oscar.c:6688
+#: src/protocols/oscar/oscar.c:6726
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokon�ana. Za zdaj je va邸 profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: src/protocols/oscar/oscar.c:6702
+#: src/protocols/oscar/oscar.c:6740
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9522,11 +9382,11 @@
 msgstr[2] "Najve�ja dol転ina profila %d bajta je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
 msgstr[3] "Najve�ja dol転ina profila %d bajte je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
 
-#: src/protocols/oscar/oscar.c:6707
+#: src/protocols/oscar/oscar.c:6745
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6787
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9535,63 +9395,63 @@
 msgstr[2] "Najve�ja dol転ina sporo�ila odsotnosti %d bajta je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
 msgstr[3] "Najve�ja dol転ina sporo�ila odsotnosti %d bajte je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
 
-#: src/protocols/oscar/oscar.c:6754
+#: src/protocols/oscar/oscar.c:6792
 msgid "Away message too long."
 msgstr "Spo_ro�ilo o odsotnosti:"
 
-#: src/protocols/oscar/oscar.c:6823
+#: src/protocols/oscar/oscar.c:6861
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogo�e dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in presledke, lahko pa so tudi sestavljeni iz samih 邸tevil."
 
-#: src/protocols/oscar/oscar.c:6825
-#: src/protocols/oscar/oscar.c:7235
-#: src/protocols/oscar/oscar.c:7249
+#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7273
+#: src/protocols/oscar/oscar.c:7287
 msgid "Unable To Add"
 msgstr "Nemogo�e dodati"
 
-#: src/protocols/oscar/oscar.c:6935
+#: src/protocols/oscar/oscar.c:6973
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogo�e pridobiti"
 
-#: src/protocols/oscar/oscar.c:6936
+#: src/protocols/oscar/oscar.c:6974
 msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Gaim za�asno ni uspel pridobiti va邸ega seznama prijateljev z AIM stre転nikov. Va邸 seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: src/protocols/oscar/oscar.c:7133
-#: src/protocols/oscar/oscar.c:7134
-#: src/protocols/oscar/oscar.c:7139
-#: src/protocols/oscar/oscar.c:7293
-#: src/protocols/oscar/oscar.c:7294
-#: src/protocols/oscar/oscar.c:7299
+#: src/protocols/oscar/oscar.c:7171
+#: src/protocols/oscar/oscar.c:7172
+#: src/protocols/oscar/oscar.c:7177
+#: src/protocols/oscar/oscar.c:7331
+#: src/protocols/oscar/oscar.c:7332
+#: src/protocols/oscar/oscar.c:7337
 msgid "Orphans"
 msgstr "Sirote"
 
-#: src/protocols/oscar/oscar.c:7233
+#: src/protocols/oscar/oscar.c:7271
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogo�e dodati, ker imate na seznamu preve� prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: src/protocols/oscar/oscar.c:7233
-#: src/protocols/oscar/oscar.c:7247
+#: src/protocols/oscar/oscar.c:7271
+#: src/protocols/oscar/oscar.c:7285
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/protocols/oscar/oscar.c:7247
+#: src/protocols/oscar/oscar.c:7285
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogo�e dodati na seznam. Najpogostej邸i razlog za to je preveliko 邸tevilo prijateljev na va邸em seznamu."
 
-#: src/protocols/oscar/oscar.c:7330
+#: src/protocols/oscar/oscar.c:7368
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga 転elite dodati?"
 
-#: src/protocols/oscar/oscar.c:7336
+#: src/protocols/oscar/oscar.c:7374
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: src/protocols/oscar/oscar.c:7380
+#: src/protocols/oscar/oscar.c:7418
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9601,17 +9461,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7425
+#: src/protocols/oscar/oscar.c:7463
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:7426
+#: src/protocols/oscar/oscar.c:7464
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7429
+#: src/protocols/oscar/oscar.c:7467
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9620,163 +9480,161 @@
 "Uporabnik %s je zavrnil va邸o zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7468
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: src/protocols/oscar/oscar.c:7467
+#: src/protocols/oscar/oscar.c:7505
 #: src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: src/protocols/oscar/oscar.c:7503
+#: src/protocols/oscar/oscar.c:7541
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: src/protocols/oscar/oscar.c:7573
+#: src/protocols/oscar/oscar.c:7611
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Va邸a slika IM ni bila poslana. Slik IM ne morete po邸iljati v klepetih AIM."
 
-#: src/protocols/oscar/oscar.c:7728
+#: src/protocols/oscar/oscar.c:7766
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: src/protocols/oscar/oscar.c:8034
+#: src/protocols/oscar/oscar.c:8072
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: src/protocols/oscar/oscar.c:8035
+#: src/protocols/oscar/oscar.c:8073
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: src/protocols/oscar/oscar.c:8054
+#: src/protocols/oscar/oscar.c:8092
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:8061
+#: src/protocols/oscar/oscar.c:8099
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: src/protocols/oscar/oscar.c:8074
+#: src/protocols/oscar/oscar.c:8112
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: src/protocols/oscar/oscar.c:8093
+#: src/protocols/oscar/oscar.c:8131
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8150
+#: src/protocols/oscar/oscar.c:8188
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8153
+#: src/protocols/oscar/oscar.c:8191
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: src/protocols/oscar/oscar.c:8158
+#: src/protocols/oscar/oscar.c:8196
 msgid "ICQ Privacy Options"
 msgstr "Mo転nosti zasebnosti ICQ"
 
-#: src/protocols/oscar/oscar.c:8175
+#: src/protocols/oscar/oscar.c:8213
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: src/protocols/oscar/oscar.c:8176
+#: src/protocols/oscar/oscar.c:8214
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike �rke in presledke."
 
-#: src/protocols/oscar/oscar.c:8183
+#: src/protocols/oscar/oscar.c:8221
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: src/protocols/oscar/oscar.c:8235
+#: src/protocols/oscar/oscar.c:8273
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8318
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne �akate na pooblastilo</i>"
 
-#: src/protocols/oscar/oscar.c:8283
+#: src/protocols/oscar/oscar.c:8321
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pri�akujete pooblastila od naslednjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8284
+#: src/protocols/oscar/oscar.c:8322
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "�e 転elite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: src/protocols/oscar/oscar.c:8301
+#: src/protocols/oscar/oscar.c:8339
 msgid "Find Buddy by E-mail"
 msgstr "Najdi prijatelja po e-po邸ti"
 
-#: src/protocols/oscar/oscar.c:8302
+#: src/protocols/oscar/oscar.c:8340
 msgid "Search for a buddy by e-mail address"
 msgstr "I邸�i prijatelje po naslovu e-po邸te"
 
-#: src/protocols/oscar/oscar.c:8303
+#: src/protocols/oscar/oscar.c:8341
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-po邸te prijatelja, ki ga 転elite najti"
 
-#: src/protocols/oscar/oscar.c:8396
+#: src/protocols/oscar/oscar.c:8434
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: src/protocols/oscar/oscar.c:8407
+#: src/protocols/oscar/oscar.c:8445
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: src/protocols/oscar/oscar.c:8411
+#: src/protocols/oscar/oscar.c:8449
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporo�il (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8421
+#: src/protocols/oscar/oscar.c:8459
 msgid "Set Privacy Options..."
 msgstr "Nastavi mo転nosti zasebnosti ..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8428
+#: src/protocols/oscar/oscar.c:8466
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: src/protocols/oscar/oscar.c:8432
+#: src/protocols/oscar/oscar.c:8470
 msgid "Confirm Account"
 msgstr "Potrdi ra�un"
 
-#: src/protocols/oscar/oscar.c:8436
+#: src/protocols/oscar/oscar.c:8474
 msgid "Display Currently Registered Address"
 msgstr "Prika転i trenutno registriran naslov"
 
-#: src/protocols/oscar/oscar.c:8440
+#: src/protocols/oscar/oscar.c:8478
 msgid "Change Currently Registered Address..."
 msgstr "Spremeni trenutno registriran naslov ..."
 
-#: src/protocols/oscar/oscar.c:8447
+#: src/protocols/oscar/oscar.c:8485
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Poka転i prijatelje, ki �akajo na pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8453
+#: src/protocols/oscar/oscar.c:8491
 msgid "Search for Buddy by Email..."
 msgstr "I邸�i prijatelja po e-po邸ti ..."
 
-#: src/protocols/oscar/oscar.c:8458
+#: src/protocols/oscar/oscar.c:8496
 msgid "Search for Buddy by Information"
 msgstr "I邸�i prijatelja po informaciji"
 
-#: src/protocols/oscar/oscar.c:8525
+#: src/protocols/oscar/oscar.c:8563
 msgid "Use recent buddies group"
 msgstr "Uporabi skupino zadnjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8528
+#: src/protocols/oscar/oscar.c:8566
 msgid "Show how long you have been idle"
 msgstr "Prika転i �as lastne neaktivnosti"
 
-#: src/protocols/oscar/oscar.c:8537
-msgid "Use AIM/ICQ proxy server (slower, but usually works)"
-msgstr ""
-"Uporabi stre転nik prehoda AIM/ICQ\n"
-"(po�asneje, vendar ponavadi deluje)"
+#: src/protocols/oscar/oscar.c:8575
+msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+msgstr "Uporabi stre転nik proxy AIM/ICQ (po�asneje/varnej邸e/ponavadi deluje)"
 
 #. *< type
 #. *< ui_requirement
@@ -9788,32 +9646,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8670
-#: src/protocols/oscar/oscar.c:8672
+#: src/protocols/oscar/oscar.c:8708
+#: src/protocols/oscar/oscar.c:8710
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8691
+#: src/protocols/oscar/oscar.c:8729
 msgid "Auth host"
 msgstr "Stre転nik za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8694
+#: src/protocols/oscar/oscar.c:8732
 msgid "Auth port"
 msgstr "Vrata za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8697
+#: src/protocols/oscar/oscar.c:8735
 #: src/protocols/zephyr/zephyr.c:2901
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/protocols/oscar/oscar.c:8701
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"Uporabi stre転nik prehoda AIM/ICQ\n"
-"(po�asneje, vendar ponavadi deluje)"
-
 #: src/protocols/sametime/sametime.c:359
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
@@ -9881,65 +9731,65 @@
 msgid "Connected"
 msgstr "Povezano"
 
-#: src/protocols/sametime/sametime.c:1542
+#: src/protocols/sametime/sametime.c:1541
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Upravljalec omre転ja Sametime je izdal naslednje obvestilo na stre転niku %s"
 
-#: src/protocols/sametime/sametime.c:1547
+#: src/protocols/sametime/sametime.c:1546
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-#: src/protocols/sametime/sametime.c:1606
+#: src/protocols/sametime/sametime.c:1605
 msgid "Connection reset"
 msgstr "Povezava ponovno nastavljena"
 
-#: src/protocols/sametime/sametime.c:1613
+#: src/protocols/sametime/sametime.c:1612
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Napaka pri branju iz vti�nice: %s"
 
 #. this is a regular connect, error out
-#: src/protocols/sametime/sametime.c:1642
-#: src/protocols/sametime/sametime.c:3601
+#: src/protocols/sametime/sametime.c:1641
+#: src/protocols/sametime/sametime.c:3595
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogo�e povezati na stre転nik."
 
-#: src/protocols/sametime/sametime.c:1679
+#: src/protocols/sametime/sametime.c:1678
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
 
-#: src/protocols/sametime/sametime.c:1853
+#: src/protocols/sametime/sametime.c:1852
 msgid "Conference Closed"
 msgstr "Konferen�ni pogovor zaprt"
 
 #  Data is assumed to be the destination sn
-#: src/protocols/sametime/sametime.c:2316
+#: src/protocols/sametime/sametime.c:2315
 msgid "Unable to send message: "
 msgstr "Ni mo� poslati sporo�ila: "
 
-#: src/protocols/sametime/sametime.c:2875
+#: src/protocols/sametime/sametime.c:2874
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: src/protocols/sametime/sametime.c:3164
+#: src/protocols/sametime/sametime.c:3163
 msgid "Microphone"
 msgstr "Mikrofon"
 
+#: src/protocols/sametime/sametime.c:3164
+msgid "Speakers"
+msgstr "Zvo�niki"
+
 #: src/protocols/sametime/sametime.c:3165
-msgid "Speakers"
-msgstr "Zvo�niki"
-
-#: src/protocols/sametime/sametime.c:3166
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: src/protocols/sametime/sametime.c:3170
+#: src/protocols/sametime/sametime.c:3169
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: src/protocols/sametime/sametime.c:3204
+#: src/protocols/sametime/sametime.c:3203
 #, c-format
 msgid ""
 "\n"
@@ -9948,7 +9798,7 @@
 "\n"
 "<b>Podpira:</b> %s"
 
-#: src/protocols/sametime/sametime.c:3209
+#: src/protocols/sametime/sametime.c:3208
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9956,143 +9806,143 @@
 "\n"
 "<b>Zunanji uporabnik</b>"
 
-#: src/protocols/sametime/sametime.c:3315
+#: src/protocols/sametime/sametime.c:3312
 msgid "Create conference with user"
 msgstr "Ustvari konferen�ni pogovor z uporabnikom"
 
-#: src/protocols/sametime/sametime.c:3316
+#: src/protocols/sametime/sametime.c:3313
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Vnesite temo za nov konferen�ni pogovor in sporo�ilo vabila za %s"
 
-#: src/protocols/sametime/sametime.c:3320
+#: src/protocols/sametime/sametime.c:3317
 msgid "New Conference"
 msgstr "Nov konferen�ni pogovor"
 
-#: src/protocols/sametime/sametime.c:3322
+#: src/protocols/sametime/sametime.c:3319
 msgid "Create"
 msgstr "Ustvari"
 
-#: src/protocols/sametime/sametime.c:3386
+#: src/protocols/sametime/sametime.c:3381
 msgid "Available Conferences"
 msgstr "Konferen�ni pogovori na voljo"
 
-#: src/protocols/sametime/sametime.c:3392
+#: src/protocols/sametime/sametime.c:3387
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferen�ni pogovor ..."
 
-#: src/protocols/sametime/sametime.c:3399
+#: src/protocols/sametime/sametime.c:3394
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferen�ni pogovor"
 
-#: src/protocols/sametime/sametime.c:3400
+#: src/protocols/sametime/sametime.c:3395
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "Iz spodnjega seznama izberite konferenco in po邸ljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", �e bi 転eleli ustvariti novo konferenco in k njej povabili uporabnika."
 
-#: src/protocols/sametime/sametime.c:3405
+#: src/protocols/sametime/sametime.c:3400
 msgid "Invite to Conference"
 msgstr "Povabi na konferen�ni pogovor"
 
-#: src/protocols/sametime/sametime.c:3407
+#: src/protocols/sametime/sametime.c:3402
 msgid "Invite"
 msgstr "Povabi"
 
-#: src/protocols/sametime/sametime.c:3459
+#: src/protocols/sametime/sametime.c:3454
 msgid "Invite to Conference..."
 msgstr "Povabi na konferen�ni pogovor ..."
 
-#: src/protocols/sametime/sametime.c:3505
+#: src/protocols/sametime/sametime.c:3500
 msgid "No Sametime Community Server specified"
 msgstr "Stre転nik Sametime Community ni naveden"
 
-#: src/protocols/sametime/sametime.c:3527
+#: src/protocols/sametime/sametime.c:3521
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr "Za ra�un Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
-#: src/protocols/sametime/sametime.c:3532
+#: src/protocols/sametime/sametime.c:3526
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: src/protocols/sametime/sametime.c:3533
+#: src/protocols/sametime/sametime.c:3527
 msgid "No Sametime Community Server Specified"
 msgstr "Stre転nik Sametime Community ni naveden"
 
-#: src/protocols/sametime/sametime.c:3535
+#: src/protocols/sametime/sametime.c:3529
 msgid "Connect"
 msgstr "Pove転i se"
 
-#: src/protocols/sametime/sametime.c:3990
+#: src/protocols/sametime/sametime.c:3984
 msgid "<b>External User</b><br>"
 msgstr "<b>Zunanji uporabnik</b><br>"
 
-#: src/protocols/sametime/sametime.c:3993
+#: src/protocols/sametime/sametime.c:3987
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Uporabni邸ki ID:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:3999
+#: src/protocols/sametime/sametime.c:3993
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Polno ime:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4005
+#: src/protocols/sametime/sametime.c:3999
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Zadnji� razpoznan odjemalec:</b> "
 
-#: src/protocols/sametime/sametime.c:4013
+#: src/protocols/sametime/sametime.c:4007
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: src/protocols/sametime/sametime.c:4020
+#: src/protocols/sametime/sametime.c:4014
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Podpira:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4026
+#: src/protocols/sametime/sametime.c:4020
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje</b>: %s"
 
-#: src/protocols/sametime/sametime.c:4169
-#: src/protocols/sametime/sametime.c:5328
+#: src/protocols/sametime/sametime.c:4161
+#: src/protocols/sametime/sametime.c:5308
 msgid "User Name"
 msgstr "Uporabni邸ko ime"
 
-#: src/protocols/sametime/sametime.c:4172
-#: src/protocols/sametime/sametime.c:5331
+#: src/protocols/sametime/sametime.c:4164
+#: src/protocols/sametime/sametime.c:5311
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: src/protocols/sametime/sametime.c:4196
+#: src/protocols/sametime/sametime.c:4188
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabni邸ki ID"
 
-#: src/protocols/sametime/sametime.c:4197
+#: src/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Imenovalec '%s' se morda nana邸a na vse na邸tete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:4202
+#: src/protocols/sametime/sametime.c:4194
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: src/protocols/sametime/sametime.c:4272
+#: src/protocols/sametime/sametime.c:4262
 msgid "Unable to add user: user not found"
 msgstr "Ni mo� dodati uporabnika: ni ga mogo�e najti"
 
-#: src/protocols/sametime/sametime.c:4274
+#: src/protocols/sametime/sametime.c:4264
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v va邸i skupnosti Sametime. Ta vnos je bil odstranjen iz va邸ega seznama prijateljev."
 
-#: src/protocols/sametime/sametime.c:4279
+#: src/protocols/sametime/sametime.c:4269
 msgid "Unable to add user"
 msgstr "Ni mogo�e dodati uporabnika"
 
-#: src/protocols/sametime/sametime.c:4849
+#: src/protocols/sametime/sametime.c:4839
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10101,145 +9951,145 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: src/protocols/sametime/sametime.c:4978
+#: src/protocols/sametime/sametime.c:4968
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:4983
+#: src/protocols/sametime/sametime.c:4973
 msgid "Buddy List Storage Mode"
 msgstr "Na�in hrambe seznama prijateljev"
 
-#: src/protocols/sametime/sametime.c:4986
+#: src/protocols/sametime/sametime.c:4976
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:4988
+#: src/protocols/sametime/sametime.c:4978
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s stre転nikovim"
 
-#: src/protocols/sametime/sametime.c:4990
+#: src/protocols/sametime/sametime.c:4980
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s stre転nikovim in ga shrani"
 
-#: src/protocols/sametime/sametime.c:4992
+#: src/protocols/sametime/sametime.c:4982
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s stre転nikom"
 
-#: src/protocols/sametime/sametime.c:5041
+#: src/protocols/sametime/sametime.c:5031
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za ra�un %s"
 
-#: src/protocols/sametime/sametime.c:5080
+#: src/protocols/sametime/sametime.c:5070
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za ra�un %s"
 
-#: src/protocols/sametime/sametime.c:5133
+#: src/protocols/sametime/sametime.c:5121
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogo�e dodati: 転e obstaja"
 
-#: src/protocols/sametime/sametime.c:5134
+#: src/protocols/sametime/sametime.c:5122
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' 転e obstaja v va邸em seznamu prijateljev."
 
-#: src/protocols/sametime/sametime.c:5137
-#: src/protocols/sametime/sametime.c:5266
+#: src/protocols/sametime/sametime.c:5125
+#: src/protocols/sametime/sametime.c:5250
 msgid "Unable to add group"
 msgstr "Skupine ni mogo�e dodati"
 
-#: src/protocols/sametime/sametime.c:5196
+#: src/protocols/sametime/sametime.c:5182
 msgid "Possible Matches"
 msgstr "Mo転ni zadetki"
 
-#: src/protocols/sametime/sametime.c:5212
+#: src/protocols/sametime/sametime.c:5198
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: src/protocols/sametime/sametime.c:5213
+#: src/protocols/sametime/sametime.c:5199
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Imenovalec '%s' se morda nana邸a na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:5218
+#: src/protocols/sametime/sametime.c:5204
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: src/protocols/sametime/sametime.c:5260
+#: src/protocols/sametime/sametime.c:5244
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: src/protocols/sametime/sametime.c:5262
+#: src/protocols/sametime/sametime.c:5246
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v va邸i skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5303
+#: src/protocols/sametime/sametime.c:5286
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: src/protocols/sametime/sametime.c:5304
+#: src/protocols/sametime/sametime.c:5287
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s �imer boste lahko v seznam prijateljev vnesli skupino in njene �lane."
 
-#: src/protocols/sametime/sametime.c:5352
+#: src/protocols/sametime/sametime.c:5332
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: src/protocols/sametime/sametime.c:5353
+#: src/protocols/sametime/sametime.c:5333
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Imenovalec '%s' se lahko nana邸a na katerega koli od na邸tetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim po邸ljite sporo�ila s spodnjimi gumbi."
 
-#: src/protocols/sametime/sametime.c:5385
+#: src/protocols/sametime/sametime.c:5362
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: src/protocols/sametime/sametime.c:5386
+#: src/protocols/sametime/sametime.c:5363
 #, c-format
 msgid "The identifier '%s' did not match and users in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom va邸e skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5390
+#: src/protocols/sametime/sametime.c:5367
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: src/protocols/sametime/sametime.c:5427
+#: src/protocols/sametime/sametime.c:5403
 msgid "Search for a user"
 msgstr "I邸�i uporabnike"
 
-#: src/protocols/sametime/sametime.c:5428
+#: src/protocols/sametime/sametime.c:5404
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5431
+#: src/protocols/sametime/sametime.c:5407
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
-#: src/protocols/sametime/sametime.c:5443
+#: src/protocols/sametime/sametime.c:5419
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5447
+#: src/protocols/sametime/sametime.c:5423
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5451
+#: src/protocols/sametime/sametime.c:5427
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
-#: src/protocols/sametime/sametime.c:5455
+#: src/protocols/sametime/sametime.c:5431
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: src/protocols/sametime/sametime.c:5552
+#: src/protocols/sametime/sametime.c:5528
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri stre転ni邸ke preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: src/protocols/sametime/sametime.c:5562
+#: src/protocols/sametime/sametime.c:5538
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
@@ -11629,18 +11479,18 @@
 msgid "Whiteboard"
 msgstr "Tabla"
 
-#: src/protocols/simple/simple.c:1231
-#: src/protocols/simple/simple.c:1270
-#: src/protocols/simple/simple.c:1282
-#: src/protocols/simple/simple.c:1329
+#: src/protocols/simple/simple.c:1207
+#: src/protocols/simple/simple.c:1246
+#: src/protocols/simple/simple.c:1258
+#: src/protocols/simple/simple.c:1305
 msgid "Could not create listen socket"
 msgstr "Vti�nice ni bilo mogo�e ustvariti"
 
-#: src/protocols/simple/simple.c:1252
+#: src/protocols/simple/simple.c:1228
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogo�e razbrati"
 
-#: src/protocols/simple/simple.c:1355
+#: src/protocols/simple/simple.c:1331
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabni邸ka imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -11652,39 +11502,31 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/simple/simple.c:1507
+#: src/protocols/simple/simple.c:1477
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
 #. *  summary
-#: src/protocols/simple/simple.c:1508
+#: src/protocols/simple/simple.c:1478
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
-#: src/protocols/simple/simple.c:1530
+#: src/protocols/simple/simple.c:1500
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: src/protocols/simple/simple.c:1537
+#: src/protocols/simple/simple.c:1507
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: src/protocols/simple/simple.c:1539
+#: src/protocols/simple/simple.c:1509
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: src/protocols/simple/simple.c:1541
+#: src/protocols/simple/simple.c:1511
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/protocols/simple/simple.c:1543
-msgid "Auth User"
-msgstr "Avtoriziraj uporabnika"
-
-#: src/protocols/simple/simple.c:1545
-msgid "Auth Domain"
-msgstr "Avtoriziraj domeno"
-
 #: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -11922,7 +11764,7 @@
 msgstr "Va邸e sporo�ilo za Yahoo! ni bilo poslano."
 
 #: src/protocols/yahoo/yahoo.c:765
-#: src/protocols/yahoo/yahoo.c:3510
+#: src/protocols/yahoo/yahoo.c:3508
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
@@ -12031,102 +11873,102 @@
 msgstr "Te転ava s povezavo"
 
 #: src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:3243
+#: src/protocols/yahoo/yahoo.c:3241
 msgid "Not at Home"
 msgstr "Nisem doma"
 
 #: src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/yahoo/yahoo.c:3246
+#: src/protocols/yahoo/yahoo.c:3244
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
 #: src/protocols/yahoo/yahoo.c:2666
-#: src/protocols/yahoo/yahoo.c:3249
+#: src/protocols/yahoo/yahoo.c:3247
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
 #: src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoo.c:3255
+#: src/protocols/yahoo/yahoo.c:3253
 msgid "On Vacation"
 msgstr "Na dopustu"
 
 #: src/protocols/yahoo/yahoo.c:2674
-#: src/protocols/yahoo/yahoo.c:3261
+#: src/protocols/yahoo/yahoo.c:3259
 msgid "Stepped Out"
 msgstr "�el na pavzo"
 
 #: src/protocols/yahoo/yahoo.c:2767
-#: src/protocols/yahoo/yahoo.c:2797
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Not on server list"
 msgstr "Ni na seznamu stre転nikov"
 
-#: src/protocols/yahoo/yahoo.c:2814
-#: src/protocols/yahoo/yahoo.c:2873
+#: src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/yahoo/yahoo.c:2871
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: src/protocols/yahoo/yahoo.c:2817
-#: src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:2815
+#: src/protocols/yahoo/yahoo.c:2892
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: src/protocols/yahoo/yahoo.c:2836
+#: src/protocols/yahoo/yahoo.c:2834
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: src/protocols/yahoo/yahoo.c:2879
+#: src/protocols/yahoo/yahoo.c:2877
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/yahoo/yahoo.c:2886
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2936
+#: src/protocols/yahoo/yahoo.c:2934
 msgid "Join in Chat"
 msgstr "Pridru転i se pomenku"
 
-#: src/protocols/yahoo/yahoo.c:2942
+#: src/protocols/yahoo/yahoo.c:2940
 msgid "Initiate Conference"
 msgstr "Za�ni konferen�ni pogovor"
 
-#: src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/yahoo/yahoo.c:2974
 msgid "Start Doodling"
 msgstr "Za�ni Doodlati"
 
-#: src/protocols/yahoo/yahoo.c:3008
+#: src/protocols/yahoo/yahoo.c:3006
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Join who in chat?"
 msgstr "Komu se 転elite pridru転iti v pomenku?"
 
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:3025
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: src/protocols/yahoo/yahoo.c:3031
+#: src/protocols/yahoo/yahoo.c:3029
 msgid "Join User in Chat..."
 msgstr "Pridru転i se uporabniku v pomenku ..."
 
-#: src/protocols/yahoo/yahoo.c:3569
+#: src/protocols/yahoo/yahoo.c:3567
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridru転ite se klepetalnici v omre転ju Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:3574
+#: src/protocols/yahoo/yahoo.c:3572
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omre転ju Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3578
+#: src/protocols/yahoo/yahoo.c:3576
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pozvonite (buzznite) pri prijatelju, da vas bo opazil"
 
-#: src/protocols/yahoo/yahoo.c:3582
+#: src/protocols/yahoo/yahoo.c:3580
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da za�ne sejo Doodle"
 
@@ -12140,133 +11982,133 @@
 #. *< version
 #. *  summary
 #. *  description
+#: src/protocols/yahoo/yahoo.c:3674
 #: src/protocols/yahoo/yahoo.c:3676
-#: src/protocols/yahoo/yahoo.c:3678
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3695
+#: src/protocols/yahoo/yahoo.c:3693
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: src/protocols/yahoo/yahoo.c:3698
+#: src/protocols/yahoo/yahoo.c:3696
 msgid "Pager host"
 msgstr "Stre転nik za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3701
+#: src/protocols/yahoo/yahoo.c:3699
 msgid "Japan Pager host"
 msgstr "Japonski gostitelj pozivnika"
 
-#: src/protocols/yahoo/yahoo.c:3704
+#: src/protocols/yahoo/yahoo.c:3702
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3707
+#: src/protocols/yahoo/yahoo.c:3705
 msgid "File transfer host"
 msgstr "Gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3710
+#: src/protocols/yahoo/yahoo.c:3708
 msgid "Japan file transfer host"
 msgstr "Japonski gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3713
+#: src/protocols/yahoo/yahoo.c:3711
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: src/protocols/yahoo/yahoo.c:3716
+#: src/protocols/yahoo/yahoo.c:3714
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3719
+#: src/protocols/yahoo/yahoo.c:3717
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: src/protocols/yahoo/yahoo.c:3723
+#: src/protocols/yahoo/yahoo.c:3721
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3726
+#: src/protocols/yahoo/yahoo.c:3724
 msgid "YCHT host"
 msgstr "Gostitelj YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3729
+#: src/protocols/yahoo/yahoo.c:3727
 msgid "YCHT port"
 msgstr "Vrata YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:707
+#: src/protocols/yahoo/yahoo_profile.c:698
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Naslov IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:783
+#: src/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
-#: src/protocols/yahoo/yahoo_profile.c:784
+#: src/protocols/yahoo/yahoo_profile.c:775
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:828
+#: src/protocols/yahoo/yahoo_profile.c:819
 msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "Oprostite, profili ozna�eni z vsebino za odrasle trenutno niso podprti."
 
-#: src/protocols/yahoo/yahoo_profile.c:830
+#: src/protocols/yahoo/yahoo_profile.c:821
 msgid "If you wish to view this profile, you will need to visit this link in your web browser"
 msgstr "�e si 転elite ogledati ta profil, morate obiskati to povezavo z va邸im spletnim brskalnikom"
 
-#: src/protocols/yahoo/yahoo_profile.c:1006
+#: src/protocols/yahoo/yahoo_profile.c:997
 msgid "Yahoo! ID"
 msgstr "Yahoo ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1078
-#: src/protocols/yahoo/yahoo_profile.c:1082
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1069
+#: src/protocols/yahoo/yahoo_profile.c:1073
+#: src/protocols/yahoo/yahoo_profile.c:1077
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo_profile.c:1096
-#: src/protocols/yahoo/yahoo_profile.c:1100
+#: src/protocols/yahoo/yahoo_profile.c:1087
+#: src/protocols/yahoo/yahoo_profile.c:1091
 msgid "Latest News"
 msgstr "Zadnje novice"
 
-#: src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/yahoo/yahoo_profile.c:1112
 msgid "Home Page"
 msgstr "Doma�a stran"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Cool Link 1"
 msgstr "Zanimiva povezava 邸t. 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1141
+#: src/protocols/yahoo/yahoo_profile.c:1132
 msgid "Cool Link 2"
 msgstr "Zanimiva povezava 邸t. 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1145
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 3"
 msgstr "Zanimiva povezava 邸t. 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1158
+#: src/protocols/yahoo/yahoo_profile.c:1149
 msgid "Last Update"
 msgstr "Nazadnje osve転eno"
 
-#: src/protocols/yahoo/yahoo_profile.c:1164
+#: src/protocols/yahoo/yahoo_profile.c:1155
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podatki o uporabniku %s niso dostopni"
 
-#: src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/yahoo/yahoo_profile.c:1161
 msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "Oprostite, profil je v jeziku ali obliki, ki trenutno ni podprta."
 
-#: src/protocols/yahoo/yahoo_profile.c:1186
+#: src/protocols/yahoo/yahoo_profile.c:1177
 msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
 msgstr "Ni mogo�e pridobiti uporabnikovega profila. Ponavadi gre za za�asno te転avo na stre転niku. Poskusite pozneje."
 
-#: src/protocols/yahoo/yahoo_profile.c:1189
+#: src/protocols/yahoo/yahoo_profile.c:1180
 msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
 msgstr "Ni mogo�e pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! ob�asno ne uspe najti uporabnikovega profila. �e veste, da uporabnik obstaja, poskusite pozneje."
 
-#: src/protocols/yahoo/yahoo_profile.c:1197
+#: src/protocols/yahoo/yahoo_profile.c:1188
 msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
@@ -12591,96 +12433,57 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: src/util.c:529
-#, c-format
-msgid "%x %X"
-msgstr "%x %X"
-
-#: src/util.c:2319
+#: src/util.c:2180
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: src/util.c:2320
+#: src/util.c:2181
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju va邸ega %s je pri邸lo do napake, zato ni bil nalo転en. Stara datoteka se je preimenovala v %s~."
 
-#: src/util.c:2813
+#: src/util.c:2676
 msgid "Calculating..."
 msgstr "Prera�unavanje ..."
 
-#: src/util.c:2816
+#: src/util.c:2679
 msgid "Unknown."
 msgstr "Neznano."
 
-#: src/util.c:2842
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunda"
-msgstr[2] "%d sekundi"
-msgstr[3] "%d sekunde"
-
-#: src/util.c:2854
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dni"
-msgstr[1] "%d dan"
-msgstr[2] "%d dneva"
-msgstr[3] "%d dni"
-
-#: src/util.c:2862
-#, c-format
-msgid "%s, %d hour"
-msgid_plural "%s, %d hours"
-msgstr[0] "%s, %d ur"
-msgstr[1] "%s, %d uro"
-msgstr[2] "%s, %d uri"
-msgstr[3] "%s, %d ur"
-
-#: src/util.c:2868
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ur"
-msgstr[1] "%d ura"
-msgstr[2] "%d uri"
-msgstr[3] "%d ure"
-
-#: src/util.c:2876
-#, c-format
-msgid "%s, %d minute"
-msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d minut"
-msgstr[1] "%s, %d minuta"
-msgstr[2] "%s, %d minuti"
-msgstr[3] "%s, %d minut"
-
-#: src/util.c:2882
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuta"
-msgstr[2] "%d minuti"
-msgstr[3] "%d minut"
-
-#: src/util.c:3349
+#: src/util.c:2709
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekund"
+msgstr[1] "sekunda"
+msgstr[2] "sekundi"
+msgstr[3] "sekunde"
+
+#: src/util.c:2723
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dni"
+msgstr[1] "dan"
+msgstr[2] "dneva"
+msgstr[3] "dnevi"
+
+#: src/util.c:2731
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "ur"
+msgstr[1] "ura"
+msgstr[2] "uri"
+msgstr[3] "ure"
+
+#: src/util.c:2739
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minuta"
+msgstr[2] "minuti"
+msgstr[3] "minute"
+
+#: src/util.c:3206
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Napaka pri vzpostavljanju povezave.\n"
 
-
-#: gaim.desktop.in:11
-msgid "Gaim Internet Messenger"
-msgstr "Gaim - spletni sel"
-
-#: gaim.desktop.in:13
-msgid "Internet Messenger"
-msgstr "Spletni sel"
-
-#: gaim.desktop.in:15
-msgid "Send instant messages over multiple protocols"
-msgstr "Po邸iljajte neposredna sporo�ila prek razli�nih protokolovs"