diff po/ca.po @ 11412:4be6232ffcd3

[gaim-migrate @ 13649] sync the oldstatus translations to head because I have not been updating head, and while head _is_ significantly different, there now exist translations in oldstatus that don't in head, and even where they exist in both, the oldstatus one is often more updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 01 Sep 2005 19:24:17 +0000
parents 67a929d50cfe
children 81e26b7f262e
line wrap: on
line diff
--- a/po/ca.po	Thu Sep 01 18:47:49 2005 +0000
+++ b/po/ca.po	Thu Sep 01 19:24:17 2005 +0000
@@ -4,7 +4,7 @@
 # Copyright (C) December 2003 (from 2003-12-12 until 2003-12-18),
 #               January (2004-01-07,12), Xan <dxpublica@telefonica.net>
 # Copyright (c) 2004, 2005,
-#               Josep Puigdemont i Casamajó <josep@imatge-sintetica.com>
+#               Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -32,30 +32,30 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-15 12:01-0400\n"
-"PO-Revision-Date: 2005-03-14 02:22+0100\n"
-"Last-Translator: Josep Puigdemont i Casamajó <josep@imatge-sintetica.com>\n"
+"POT-Creation-Date: 2005-08-08 01:25+0200\n"
+"PO-Revision-Date: 2005-08-08 01:29+0200\n"
+"Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\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"
 
-#: plugins/autorecon.c:291
+#: ../plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr "Supressió del missatge d'error"
 
-#: plugins/autorecon.c:295
+#: ../plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr "Oculta els errors de desconnexió"
 
-#: plugins/autorecon.c:299
+#: ../plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr "Oculta els errors en entrar"
 
-#: plugins/autorecon.c:303
-msgid "Hide Reconnecting Dialog"
-msgstr "Oculta el quadre de diàleg de reconnexió"
+#: ../plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "Recupera l'estat d'absent en tornar a connectar"
 
 #. *< type
 #. *< ui_requirement
@@ -63,7 +63,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: ../plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "Torna a connectar automàticament"
 
@@ -71,48 +71,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330 plugins/autorecon.c:332
+#: ../plugins/autorecon.c:279 ../plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Això us tornarà a connectar si us fan fora."
 
-#: plugins/contact_priority.c:84
+#: ../plugins/chkmail.c:94 ../plugins/chkmail.c:117 ../plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "Servidor de correu"
+
+#: ../plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d nous/%d total)"
+
+#: ../plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "Comprova el correu"
+
+#: ../plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "Comprova el correu electrònic cada X segons.\n"
+
+#: ../plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Puntuació quan..."
 
-#: plugins/contact_priority.c:93
+#: ../plugins/contact_priority.c:93
 msgid "Buddy is offline:"
 msgstr "L'amic no està connectat:"
 
-#: plugins/contact_priority.c:107
+#: ../plugins/contact_priority.c:107
 msgid "Buddy is away:"
 msgstr "L'amic està absent:"
 
-#: plugins/contact_priority.c:121
+#: ../plugins/contact_priority.c:121
 msgid "Buddy is idle:"
 msgstr "L'amic està inactiu:"
 
-#: plugins/contact_priority.c:135
+#: ../plugins/contact_priority.c:135
 msgid "Use last matching buddy"
 msgstr "Usa el darrer amic que concordi amb la cerca"
 
 #. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
+#: ../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."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 "L'amic amb la menor puntuació tindrà prioritat de contacte.\n"
-"Els valors per defecte (desconnectat=4, absent=2 i innactiu=1) faran servir\n"
+"Els valors per defecte (desconnectat=4, absent=2 i inactiu=1) faran servir\n"
 "el que acostumava a ser l'ordra preestaböert actiu->inactiu->absent->actiu"
 "+inactiu-desconnectat."
 
-#: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
+#: ../plugins/contact_priority.c:144
+msgid "Point values to use for Account..."
 msgstr "Puntuació per als comptes..."
 
 #. *< type
@@ -121,99 +136,95 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "Prioritat de contacte"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:198
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Us permet canviar els valors associats als diferents estats dels amics."
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:200
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Us permet canviar els valors dels estats innactiu, absent i desconnectat pel "
+"Us permet canviar els valors dels estats inactiu, absent i desconnectat pel "
 "càlcul de la prioritat dels amics."
 
-#.
-#. *  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 - Ha desconnectat"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Absent"
-
-#: plugins/docklet/docklet.c:136
+#: ../plugins/docklet/docklet.c:137 ../src/gtkaccount.c:751
+#: ../src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "Connexió automàtica"
+
+#: ../plugins/docklet/docklet.c:140
 msgid "New Message..."
 msgstr "Missatge nou..."
 
-#: plugins/docklet/docklet.c:137
+#: ../plugins/docklet/docklet.c:141
 msgid "Join A Chat..."
 msgstr "Entra a un xat..."
 
-#: plugins/docklet/docklet.c:172
+#: ../plugins/docklet/docklet.c:173
 msgid "New..."
 msgstr "Nou..."
 
-#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
-#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
-#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
-#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
+#: ../plugins/docklet/docklet.c:177 ../src/gtkprefs.c:1813
+#: ../src/protocols/gg/gg.c:52 ../src/protocols/irc/msgs.c:227
+#: ../src/protocols/jabber/jabber.c:998 ../src/protocols/jabber/jutil.c:32
+#: ../src/protocols/jabber/presence.c:69
+#: ../src/protocols/jabber/presence.c:132
+#: ../src/protocols/novell/novell.c:2800 ../src/protocols/novell/novell.c:2917
+#: ../src/protocols/novell/novell.c:2969 ../src/protocols/oscar/oscar.c:685
+#: ../src/protocols/oscar/oscar.c:5802 ../src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:6999 ../src/protocols/silc/buddy.c:1388
+#: ../src/protocols/silc/silc.c:47 ../src/protocols/silc/silc.c:81
 msgid "Away"
 msgstr "Absent"
 
-#: plugins/docklet/docklet.c:184
+#. else...
+#: ../plugins/docklet/docklet.c:183 ../src/away.c:595
+#: ../src/protocols/oscar/oscar.c:5720 ../src/protocols/oscar/oscar.c:7007
 msgid "Back"
 msgstr "De tornada"
 
-#: plugins/docklet/docklet.c:191
+#: ../plugins/docklet/docklet.c:191
 msgid "Mute Sounds"
-msgstr "Deshabilita els sons"
-
-#: plugins/docklet/docklet.c:198 src/gtkft.c:694
+msgstr "Inhabilita els sons"
+
+#: ../plugins/docklet/docklet.c:196 ../src/gtkft.c:659
 msgid "File Transfers"
 msgstr "Transferència de fitxers"
 
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
+#: ../plugins/docklet/docklet.c:197 ../src/gtkaccount.c:2391
 msgid "Accounts"
 msgstr "Comptes"
 
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
+#: ../plugins/docklet/docklet.c:198 ../src/gtkprefs.c:2514
 msgid "Preferences"
 msgstr "Preferències"
 
-#: plugins/docklet/docklet.c:204
+#: ../plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "Desconnecta"
+
+#: ../plugins/docklet/docklet.c:211
 msgid "Quit"
 msgstr "Surt"
 
-#: plugins/docklet/docklet.c:529
+#: ../plugins/docklet/docklet.c:527
 msgid "Tray Icon Configuration"
 msgstr "Configuració de la icona d'estat"
 
-#: plugins/docklet/docklet.c:533
+#: ../plugins/docklet/docklet.c:531
 msgid "_Hide new messages until tray icon is clicked"
-msgstr "_Oculta missatges nous fins que no es faci clic a la icona d'estat"
+msgstr "_Oculta els missatges nous fins que no es faci clic a la icona d'estat"
 
 #. *< type
 #. *< ui_requirement
@@ -221,19 +232,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:557
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:562
+#: ../plugins/docklet/docklet.c:560
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Mostra una icona per al Gaim a la barra d'estat."
 
 #. *  description
-#: plugins/docklet/docklet.c:564
+#: ../plugins/docklet/docklet.c:562
 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, "
@@ -246,19 +257,42 @@
 "posar en cua els missatges fins que es faci clic a la icona, de forma "
 "similar a l'ICQ."
 
-#: plugins/extplacement.c:77
+#.
+#. *  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 - Desconnectat"
+
+#: ../plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "Gaim - Absent"
+
+#: ../plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "Orientació"
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "Orientació de l'àrea de notificació."
+
+#: ../plugins/extplacement.c:77
 msgid "By conversation count"
 msgstr "Pel nombre de converses"
 
-#: plugins/extplacement.c:98
+#: ../plugins/extplacement.c:98
 msgid "Conversation Placement"
 msgstr "Ubicació de la conversa"
 
-#: plugins/extplacement.c:103
+#: ../plugins/extplacement.c:103
 msgid "Number of conversations per window"
-msgstr "Número de converses per finestra"
-
-#: plugins/extplacement.c:109
+msgstr "Nombre de converses per finestra"
+
+#: ../plugins/extplacement.c:109
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separa les finestres de xat i de MI quan s'ubiquin per nombre"
 
@@ -268,19 +302,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:130
+#: ../plugins/extplacement.c:130
 msgid "ExtPlacement"
 msgstr "Ubicació extra"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:132
 msgid "Extra conversation placement options."
 msgstr "Opcions extres per a la ubicació de les converses."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:134
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -294,7 +328,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Control de fitxers del Gaim"
 
@@ -302,84 +336,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:227 ../plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Us permet controlar el Gaim entrant ordres en un fitxer."
 
-#: plugins/gaim-remote/remote.c:91
-msgid "Not connected to AIM"
-msgstr "No esteu connectat a l'AIM"
-
-#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
-msgid "No screenname given."
-msgstr "No s'ha indicat cap nom d'usuari."
-
-#: plugins/gaim-remote/remote.c:176
-msgid "No roomname given."
-msgstr "No s'ha indicat el nom de la sala."
-
-#: plugins/gaim-remote/remote.c:195
-msgid "Invalid AIM URI"
-msgstr "L'URI d'AIM no és vàlida"
-
-#: plugins/gaim-remote/remote.c:750
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"No s'ha pogut assignar %s al sòcol:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:774
-msgid "Unable to open socket"
-msgstr "No s'ha pogut obrir el sòcol"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:824
-msgid "Remote Control"
-msgstr "Control remot"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaim-remote/remote.c:827
-msgid "Provides remote control for gaim applications."
-msgstr "Proporciona control remot per a aplicacions Gaim."
-
-#. *  description
-#: plugins/gaim-remote/remote.c:829
-msgid ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
-msgstr ""
-"Permet controlar el Gaim remotament a través d'aplicacions externes o a "
-"través de l'eina gaim-remote."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:90
 msgid "Gaim Demonstration Plugin"
 msgstr "Connector de demostració del Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:93
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un connector d'exemple que fa coses - vegeu-ne la descripció."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:95
 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"
@@ -392,93 +371,76 @@
 "- envia un missatge a tots els amics immediatament després de que es "
 "connectin"
 
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr "Color del cursor"
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "Color secundari del cursor"
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr "Color dels hiperenllaços"
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr "Mida de l'expansor del GTkTreeView"
-
-#: plugins/gaimrc.c:72
-msgid "Conversation Entry"
-msgstr "Entrada de la conversa"
-
-#: plugins/gaimrc.c:73
-msgid "Conversation History"
-msgstr "Històric de converses"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "Visualitzador del registre"
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "Diàleg de sol·licitud"
-
-#: plugins/gaimrc.c:76
-msgid "Notify Dialog"
-msgstr "Diàleg de notificació"
-
-#: plugins/gaimrc.c:209
-#, c-format
-msgid "Select Color for %s"
-msgstr "Selecciona el color per a %s"
-
-#: plugins/gaimrc.c:211
-msgid "Select Color"
-msgstr "Selecciona el color per a %s"
-
-#: plugins/gaimrc.c:246
-#, c-format
-msgid "Select Font for %s"
-msgstr "Selecciona el tipus de lletra per a %s"
-
-#: plugins/gaimrc.c:284
-msgid "Select Interface Font"
-msgstr "Selecciona el tipus de lletra de la interfície"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
-msgid "GTK+ Interface Font"
-msgstr "Tipus de lletra de la interfície Gtk"
-
-#: plugins/gaimrc.c:362
-#, fuzzy
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Tema de la drecera de text de Gtk"
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr "Control de temes GTK+ del Gaim"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Proporciona accés a peràmetres del gtkrc utilitzats habitualment ."
+#: ../plugins/gaim-remote/remote.c:91
+msgid "Not connected to AIM"
+msgstr "No esteu connectat a l'AIM"
+
+#: ../plugins/gaim-remote/remote.c:100 ../plugins/gaim-remote/remote.c:139
+msgid "No screenname given."
+msgstr "No s'ha indicat cap nom d'usuari."
+
+#: ../plugins/gaim-remote/remote.c:176
+msgid "No roomname given."
+msgstr "No s'ha indicat el nom de la sala."
+
+#: ../plugins/gaim-remote/remote.c:195
+msgid "Invalid AIM URI"
+msgstr "L'URI d'AIM no és vàlida"
+
+#: ../plugins/gaim-remote/remote.c:673
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"No s'ha pogut assignar %s al sòcol:\n"
+"%s"
+
+#: ../plugins/gaim-remote/remote.c:697
+msgid "Unable to open socket"
+msgstr "No s'ha pogut obrir el sòcol"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/gaim-remote/remote.c:747
+msgid "Remote Control"
+msgstr "Control remot"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/gaim-remote/remote.c:750
+msgid "Provides remote control for gaim applications."
+msgstr "Proporciona control remot per a aplicacions Gaim."
+
+#. *  description
+#: ../plugins/gaim-remote/remote.c:752
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr ""
+"Permet controlar el Gaim remotament a través d'aplicacions externes o a "
+"través de l'eina gaim-remote."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:241
+#: ../plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "Configuració de les gesticulacions amb el ratolí"
 
-#: plugins/gestures/gestures.c:248
+#: ../plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Botó central del ratolí"
 
-#: plugins/gestures/gestures.c:253
+#: ../plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Botó dret del ratolí"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:265
+#: ../plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "Mostra les gesticulacions _visualment"
 
@@ -488,19 +450,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:294
+#: ../plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "Gesticulacions amb el ratolí"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:297
+#: ../plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
-msgstr "Proporciona suport per a gesticulacions amb el ratolí"
+msgstr "Permet l'ús de gesticulacions amb el ratolí"
 
 #. *  description
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -516,49 +478,49 @@
 "A dalt i després a l'esquerra per passar a l'anterior conversa\n"
 "A dalt i després a la dreta per passar a la següent conversa"
 
-#: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: ../plugins/gevolution/add_buddy_dialog.c:132
+#: ../plugins/gevolution/assoc-buddy.c:120 ../src/gtkprefs.c:2168
+#: ../src/gtkroomlist.c:553 ../src/protocols/jabber/jabber.c:609
+#: ../src/protocols/msn/msn.c:1474 ../src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/gevolution/add_buddy_dialog.c:143
+#: ../plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Missatgeria instantània"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccioneu una persona de la llibreta d'adreces d'aquí baix, o afegiu-n'hi "
 "una de nova."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
+#: ../plugins/gevolution/add_buddy_dialog.c:468
+#: ../plugins/gevolution/assoc-buddy.c:354 ../src/protocols/oscar/oscar.c:7283
 msgid "Search"
 msgstr "Cerca"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
-#: src/gtkblist.c:4777
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:304 ../src/gtkblist.c:4186
+#: ../src/gtkblist.c:4534
 msgid "Group:"
 msgstr "Grup:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
-#: plugins/gevolution/assoc-buddy.c:466
+#: ../plugins/gevolution/add_buddy_dialog.c:575
+#: ../plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "Nova persona"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Selecciona amic"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:341
+#: ../plugins/gevolution/assoc-buddy.c:341
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -567,59 +529,48 @@
 "creeu-n'hi una de nova."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:429
+#: ../plugins/gevolution/assoc-buddy.c:429
 msgid "Show user details"
 msgstr "Mostra els detalls de l'usuari"
 
-#: plugins/gevolution/assoc-buddy.c:430
+#: ../plugins/gevolution/assoc-buddy.c:430
 msgid "Hide user details"
 msgstr "Oculta els detalls de l'usuari"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:483
+#: ../plugins/gevolution/assoc-buddy.c:483
 msgid "_Associate Buddy"
 msgstr "_Associa amic"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:74 ../plugins/gevolution/eds-utils.c:87
+#: ../src/gtkblist.c:3122 ../src/gtkprefs.c:962 ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1827 ../src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "Cap"
+
+#: ../plugins/gevolution/gevolution.c:93 ../plugins/gevolution/gevo-util.c:64
+#: ../src/blist.c:776 ../src/blist.c:983 ../src/blist.c:1936
+#: ../src/gtkblist.c:4001 ../src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Amics"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "No s'ha pogut enviar el missatge."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: ../plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "Afegeix a la llibreta d'adreces"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "Correu electrònic"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Configuració de la integració amb l'Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:351
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccioneu tots els comptes on els amics s'hagin d'afegir automàticament."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
+#: ../plugins/gevolution/gevolution.c:381 ../plugins/idle.c:52
+#: ../src/gtkconn.c:627
 msgid "Account"
 msgstr "Comptes"
 
@@ -629,7 +580,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Integració amb l'Evolution"
 
@@ -637,87 +588,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: ../plugins/gevolution/gevolution.c:467
+#: ../plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "Proporciona la integració amb el Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "Entreu la informació de la persona aquí sota."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Entreu el nom d'usuari i el tipus de compte aquí sota."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "Tipus de compte:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: ../plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "Nom d'usuari:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "Informació opcional:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
+#: ../plugins/gevolution/new_person_dialog.c:335 ../src/gtkaccount.c:379
+#: ../src/gtkaccount.c:409 ../src/protocols/oscar/oscar.c:591
 msgid "Buddy Icon"
 msgstr "Icona de l'amic"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "Nom:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Cognoms:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "Correu electrònic:"
 
-#: plugins/history.c:137
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:138
-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:177
-msgid "History"
-msgstr "Historial"
-
-#: plugins/history.c:179
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra converses registrades recentment en noves converses."
-
-#: plugins/history.c:180
-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:106
+#: ../plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "Comprovació de senyals GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:105 ../plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Prova per veure si tots els senyals de la interfície d'usuari funcionen "
+"correctament."
+
+#: ../plugins/history.c:92
+msgid "History"
+msgstr "Historial"
+
+#: ../plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Mostra converses registrades recentment en noves converses."
+
+#: ../plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Quan s'obri una nova conversa aquest connector inserirà la darrera conversa "
+"en la conversa actual."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "Iconifica si s'està absent"
 
@@ -725,31 +682,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: ../plugins/iconaway.c:107 ../plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifica la llista d'amics i les converses quan passeu a absent."
 
-#: plugins/idle.c:56
+#: ../plugins/idle.c:56
 msgid "Minutes"
 msgstr "Minuts"
 
-#: plugins/idle.c:63 plugins/idle.c:97
+#: ../plugins/idle.c:63 ../plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:64 plugins/idle.c:79
+#: ../plugins/idle.c:64 ../plugins/idle.c:79
 msgid "Set Account Idle Time"
 msgstr "Especifiqueu el temps inactiu per al compte"
 
-#: plugins/idle.c:67
+#: ../plugins/idle.c:67
 msgid "_Set"
 msgstr "E_specifica"
 
-#: plugins/idle.c:68
+#: ../plugins/idle.c:68 ../src/away.c:922
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: plugins/idle.c:99 plugins/idle.c:100
+#: ../plugins/idle.c:100 ../plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Us permet configurar a mà per quant de temps heu estat inactiu"
 
@@ -759,19 +716,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Client de proves d'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 "Connector de proves com a client per a 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."
@@ -785,103 +742,98 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de proves d'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 "Connector de proves per a servidor d'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 "Connector de proves per a servidor d'IPC, que registra les ordres IPC."
 
-#: plugins/mailchk.c:160
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Comprovador de correu"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Comprova si hi ha correu nou a la màquina local."
 
-#: 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 ""
 "Afegeix una caixeta a la llista d'amics que indica si teniu correus nous."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:642
+#: ../plugins/notify.c:614
 msgid "Notify For"
 msgstr "Notifica per a"
 
-#: plugins/notify.c:646
+#: ../plugins/notify.c:618
 msgid "_IM windows"
 msgstr "Finestres de M_I"
 
-#: plugins/notify.c:653
+#: ../plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "Finestres de _xat"
 
-#: plugins/notify.c:660
+#: ../plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "_Finestres actives"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:668
+#: ../plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "Mètodes de notificació"
 
-#: plugins/notify.c:675
+#: ../plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "Po_sa aquesta cadena davant del títol de la finestra:"
 
 #. Count method button
-#: plugins/notify.c:694
+#: ../plugins/notify.c:666
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insereix el _nombre de missatges nous al títol de la finestra"
 
 #. Urgent method button
-#: plugins/notify.c:702
+#: ../plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aplica l'opció \"_URGENT\" del gestor de finestres"
 
-#. Raise window method button
-#: plugins/notify.c:710
-msgid "R_aise conversation window"
-msgstr "_Alça la finestra de conversa"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:718
+#: ../plugins/notify.c:682
 msgid "Notification Removal"
 msgstr "Supressió de notificacions"
 
 #. Remove on focus button
-#: plugins/notify.c:723
+#: ../plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr "Suprimeix quan la finestra de la conversa esti_gui activada"
 
 #. Remove on click button
-#: plugins/notify.c:730
+#: ../plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr "Suprimeix quan es faci clic a la finestra de la conve_rsa"
 
 #. Remove on type button
-#: plugins/notify.c:738
+#: ../plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr "Suprimeix quan s'escrigui a la fines_tra de la conversa"
 
 #. Remove on message send button
-#: plugins/notify.c:746
+#: ../plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr "Suprimeix quan s'enviï un _missatge"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:755
+#: ../plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 
@@ -891,7 +843,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:845
+#: ../plugins/notify.c:809
 msgid "Message Notification"
 msgstr "Notificació de missatges"
 
@@ -899,7 +851,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:848 plugins/notify.c:850
+#: ../plugins/notify.c:812 ../plugins/notify.c:814
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Us proporciona diferents maneres de notificar-vos la presència de missatges "
@@ -911,26 +863,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:567
+#: ../plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Carregador de connectors en Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
+#: ../plugins/perl/perl.c:537 ../plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "Proporciona suport per a carregar connectors en Perl."
 
-#: plugins/raw.c:151
+#: ../plugins/raw.c:151
 msgid "Raw"
 msgstr "En brut"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Us permet enviar dades en brut als protocols en mode text."
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -939,21 +891,21 @@
 "TOC). Premeu la tecla de retorn a la caixa d'entrada per enviar-les. "
 "Observeu la finestra de depuració."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Esteu usant la versió %s del Gaim. La versió actual és %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 msgstr ""
-"<b>Registre dels canvis:</b>\n"
+"<b>Registre de canvis:</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/"
@@ -962,7 +914,7 @@
 "Podeu obtenir la versió %s de:<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 "Nova versió disponible"
 
@@ -972,24 +924,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
-msgstr "Notificació de noves versions"
+msgstr "Notificació de versions noves"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
-msgstr "Comprova periòdicament si hi ha noves versions."
+msgstr "Comprova periòdicament si hi ha versions noves."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Comprova periòdicament si hi ha noves versions i us ho notifica juntament "
+"Comprova periòdicament si hi ha versions noves i us ho notifica juntament "
 "amb el seu registre de canvis."
 
 #. *< type
@@ -998,7 +950,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:626
+#: ../plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr "Comprovació de senyals"
 
@@ -1006,7 +958,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:629 plugins/signals-test.c:631
+#: ../plugins/signals-test.c:604 ../plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr "Prova per veure si tots els senyals funcionen correctament."
 
@@ -1016,7 +968,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Connector simple"
 
@@ -1024,47 +976,39 @@
 #. *< 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 "Proves per veure si la majoria de coses funcionen."
 
-#: plugins/spellchk.c:1680
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1681
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1826
+#: ../plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr "Substitució de text"
 
-#: plugins/spellchk.c:1850
+#: ../plugins/spellchk.c:440
 msgid "You type"
 msgstr "Quan escriviu"
 
-#: plugins/spellchk.c:1862
+#: ../plugins/spellchk.c:452
 msgid "You send"
 msgstr "S'enviarà"
 
-#: plugins/spellchk.c:1888
+#: ../plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr "Afegeix una altra substitució de text"
 
-#: plugins/spellchk.c:1895
+#: ../plugins/spellchk.c:485
 msgid "You _type:"
 msgstr "_Escriviu:"
 
-#: plugins/spellchk.c:1909
+#: ../plugins/spellchk.c:499
 msgid "You _send:"
 msgstr "_S'envia:"
 
-#: plugins/spellchk.c:1951
+#: ../plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr "Substitució de text"
 
-#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
+#: ../plugins/spellchk.c:543 ../plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitueix el text dels missatges que s'envien usant les regles que hagueu "
@@ -1076,7 +1020,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Proporciona una interfície per a les biblioteques de suport d'SSL."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/ssl/ssl-gnutls.c:226
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1084,7 +1046,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:229 ../plugins/ssl/ssl-gnutls.c:231
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona suport per a SSL a través de la biblioteca GNUTLS."
 
@@ -1094,7 +1056,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:318
 msgid "NSS"
 msgstr "NSS"
 
@@ -1102,67 +1064,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:321 ../plugins/ssl/ssl-nss.c:323
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona suport per a SSL a través de la biblioteca NSS de Mozilla."
 
+#: ../plugins/statenotify.c:41
+#, c-format
+msgid "%s has gone away."
+msgstr "%s ha passat a absent."
+
+#: ../plugins/statenotify.c:48
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s ja no està absent."
+
+#: ../plugins/statenotify.c:55
+#, c-format
+msgid "%s has become idle."
+msgstr "%s ha passat a inactiu."
+
+#: ../plugins/statenotify.c:62
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s ja no està inactiu."
+
+#: ../plugins/statenotify.c:73
+msgid "Notify When"
+msgstr "Notifica quan"
+
+#: ../plugins/statenotify.c:76
+msgid "Buddy Goes _Away"
+msgstr "L'amic passa a _absent:"
+
+#: ../plugins/statenotify.c:79
+msgid "Buddy Goes _Idle"
+msgstr "L'amic passa a _inactiu:"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona una interfície per a les biblioteques de suport d'SSL."
-
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s ha passat a absent."
-
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s ja no està absent."
-
-#: plugins/statenotify.c:56
-#, c-format
-msgid "%s has become idle."
-msgstr "%s ha passat a inactiu."
-
-#: plugins/statenotify.c:63
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s ja no està inactiu."
-
-#: plugins/statenotify.c:74
-msgid "Notify When"
-msgstr "Notifica quan"
-
-#: plugins/statenotify.c:77
-msgid "Buddy Goes _Away"
-msgstr "L'amic passa a _absent:"
-
-#: plugins/statenotify.c:80
-msgid "Buddy Goes _Idle"
-msgstr "L'amic passa a _innactiu:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "Notificació de l'estat dels amics"
 
@@ -1170,17 +1114,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:122 ../plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "Notifica en la finestra de conversa quan un amic canvia d'estat."
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de connectors en Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:365 ../plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Proporciona suport per carregar els connectors en Tcl"
 
@@ -1191,7 +1135,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:75 ../plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
 msgstr "Indicador d'amics"
 
@@ -1199,23 +1143,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
+#: ../plugins/ticker/ticker.c:334 ../plugins/ticker/ticker.c:336
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versió horitzontal de la llista d'amics."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "Marca horària per a l'iChat"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Retard"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minuts."
 
-#: plugins/timestamp.c:222
+#: ../plugins/timestamp.c:206
 msgid "_Apply"
 msgstr "_Aplica"
 
@@ -1225,7 +1169,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: ../plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "Marca horària"
 
@@ -1233,36 +1177,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290 plugins/timestamp.c:292
+#: ../plugins/timestamp.c:274 ../plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Afegeix marques horàries a les converses a l'estil iChat cada N minuts."
 
-#: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:413
-#: plugins/win32/transparency/win2ktrans.c:444
+#: ../plugins/win32/transparency/win2ktrans.c:134
+#: ../plugins/win32/transparency/win2ktrans.c:413
+#: ../plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "Opacitat:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:394
+#: ../plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "Finestres de MI"
 
-#: plugins/win32/transparency/win2ktrans.c:395
+#: ../plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "Transparència de les finestres de M_I"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: ../plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra d'ajustament a la finestra de MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430
+#: ../plugins/win32/transparency/win2ktrans.c:430 ../src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "Finestra de la llista d'amics"
 
-#: plugins/win32/transparency/win2ktrans.c:431
+#: ../plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "_Transparència de la finestra de la llista d'amics"
 
@@ -1272,19 +1216,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: ../plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "Transparència"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
+#: ../plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparència variable per a converses i la llista d'amics."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:494
+#: ../plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1296,207 +1240,228 @@
 "\n"
 "* Nota: aquest connector requereix Windows 2000 o Windows XP."
 
-#: plugins/win32/winprefs/winprefs.c:401
+#: ../plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "Versió del mòdul d'execució de GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:409
+#: ../plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Inicialització"
 
-#: plugins/win32/winprefs/winprefs.c:410
+#: ../plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "_Inicia el Gaim en iniciar Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
-#: src/gtkprefs.c:2099
+#: ../plugins/win32/winprefs/winprefs.c:362 ../src/gtkblist.c:3167
+#: ../src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "Llista d'amics"
 
-#: plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "Llista _d'amics acoblable"
 
+#. Docked Blist On Top
+#: ../plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr "Posa la llista d'amics aco_blable sempre per sobre"
+
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:426
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
+#: ../plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr "_Conserva la finestra d'amics per sobre"
 
-#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Mai"
-
-#: plugins/win32/winprefs/winprefs.c:429
-#, fuzzy
-msgid "Always"
-msgstr "Absent"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:431
-msgid "Only when docked"
-msgstr ""
-
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
-#: src/gtkprefs.c:2100
+#: ../plugins/win32/winprefs/winprefs.c:382 ../src/gtkprefs.c:1007
+#: ../src/gtkprefs.c:2422 ../src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr "Converses"
 
-#: plugins/win32/winprefs/winprefs.c:436
-#, fuzzy
-msgid "_Flash window when messages are received"
+#: ../plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arribin missatges"
 
-#: plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "Opcions del WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:461
+#: ../plugins/win32/winprefs/winprefs.c:409
+#: ../plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Opcions específiques de la versió del Gaim per a Windows"
 
-#: plugins/win32/winprefs/winprefs.c:462
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-msgid "accounts"
-msgstr "comptes"
-
-#: src/account.c:913
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "La contrasenya ha caducat"
-
-#: src/account.c:939
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Entreu la contrasenya per a %s (%s)"
-
-#: src/account.c:946
-msgid "Enter Password"
-msgstr "Introduïu la contrasenya"
-
-#: src/account.c:951
-#, fuzzy
-msgid "Save password"
+#: ../src/account.c:298 ../src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr "Les noves contrasenyes no coincideixen."
+
+#: ../src/account.c:307
+msgid "Fill out all fields completely."
+msgstr "Ompliu tots els camps completament."
+
+#: ../src/account.c:332
+msgid "Original password"
+msgstr "Contrasenya original"
+
+#: ../src/account.c:339
+msgid "New password"
 msgstr "Nova contrasenya"
 
+#: ../src/account.c:346
+msgid "New password (again)"
+msgstr "Nova contrasenya (repetiu-la)"
+
+#: ../src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr "Canvia la contrasenya per a %s"
+
+#: ../src/account.c:360
+msgid "Please enter your current password and your new password."
+msgstr "Introduïu la contrasenya actual, i la nova."
+
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:959 src/account.c:1111 src/gtkdialogs.c:504
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
-#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:3774
-#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
-#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
-#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 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:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
+#: ../src/account.c:363 ../src/connection.c:198 ../src/gtkblist.c:2492
+#: ../src/gtkdialogs.c:506 ../src/gtkdialogs.c:648 ../src/gtkdialogs.c:702
+#: ../src/gtkrequest.c:243 ../src/protocols/jabber/jabber.c:1086
+#: ../src/protocols/jabber/xdata.c:337 ../src/protocols/msn/msn.c:226
+#: ../src/protocols/msn/msn.c:241 ../src/protocols/msn/msn.c:256
+#: ../src/protocols/msn/msn.c:271 ../src/protocols/oscar/oscar.c:2414
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3781
+#: ../src/protocols/oscar/oscar.c:7070 ../src/protocols/oscar/oscar.c:7162
+#: ../src/protocols/oscar/oscar.c:7214 ../src/protocols/oscar/oscar.c:7300
+#: ../src/protocols/silc/buddy.c:460 ../src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:722 ../src/protocols/silc/ops.c:1081
+#: ../src/protocols/silc/ops.c:1699 ../src/protocols/silc/silc.c:711
+#: ../src/protocols/yahoo/yahoo.c:3021 ../src/protocols/yahoo/yahoo.c:3030
+#: ../src/request.h:1245
 msgid "OK"
 msgstr "D'acord"
 
-#: src/account.c:960 src/account.c:1112 src/account.c:1150
-#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
-#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
-#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
-#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
-#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
-#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
-#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
-#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
+#: ../src/account.c:364 ../src/account.c:402 ../src/away.c:367
+#: ../src/connection.c:199 ../src/gtkaccount.c:2029 ../src/gtkaccount.c:2568
+#: ../src/gtkaccount.c:2599 ../src/gtkblist.c:2493 ../src/gtkblist.c:4572
+#: ../src/gtkconn.c:169 ../src/gtkdialogs.c:507 ../src/gtkdialogs.c:649
+#: ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:801 ../src/gtkdialogs.c:823
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:880 ../src/gtkdialogs.c:940
+#: ../src/gtkdialogs.c:983 ../src/gtkdialogs.c:1024
+#: ../src/gtkimhtmltoolbar.c:437 ../src/gtkprivacy.c:597
+#: ../src/gtkprivacy.c:610 ../src/gtkprivacy.c:635 ../src/gtkprivacy.c:646
+#: ../src/gtkrequest.c:244 ../src/protocols/icq/gaim_icq.c:276
+#: ../src/protocols/jabber/buddy.c:515 ../src/protocols/jabber/chat.c:754
+#: ../src/protocols/jabber/jabber.c:678 ../src/protocols/jabber/jabber.c:1087
+#: ../src/protocols/jabber/presence.c:213 ../src/protocols/jabber/xdata.c:338
+#: ../src/protocols/msn/msn.c:227 ../src/protocols/msn/msn.c:242
+#: ../src/protocols/msn/msn.c:257 ../src/protocols/msn/msn.c:272
+#: ../src/protocols/msn/msn.c:289 ../src/protocols/oscar/oscar.c:1535
+#: ../src/protocols/oscar/oscar.c:2415 ../src/protocols/oscar/oscar.c:3645
+#: ../src/protocols/oscar/oscar.c:3688 ../src/protocols/oscar/oscar.c:3725
+#: ../src/protocols/oscar/oscar.c:3782 ../src/protocols/oscar/oscar.c:7071
+#: ../src/protocols/oscar/oscar.c:7163 ../src/protocols/oscar/oscar.c:7215
+#: ../src/protocols/oscar/oscar.c:7284 ../src/protocols/oscar/oscar.c:7301
+#: ../src/protocols/silc/buddy.c:461 ../src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1133 ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:723 ../src/protocols/silc/ops.c:1700
+#: ../src/protocols/silc/silc.c:712 ../src/protocols/trepia/trepia.c:348
+#: ../src/protocols/yahoo/yahoo.c:3022 ../src/protocols/yahoo/yahoo.c:3031
+#: ../src/request.h:1245 ../src/request.h:1255
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/account.c:982 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "No s'ha trobat el connector per al protocol %s"
-
-#: src/account.c:984 src/connection.c:99
-msgid "Connection Error"
-msgstr "Error de connexió"
-
-#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
-msgid "New passwords do not match."
-msgstr "Les noves contrasenyes no coincideixen."
-
-#: src/account.c:1055
-msgid "Fill out all fields completely."
-msgstr "Ompliu tots els camps completament."
-
-#: src/account.c:1080
-msgid "Original password"
-msgstr "Contrasenya original"
-
-#: src/account.c:1087
-msgid "New password"
-msgstr "Nova contrasenya"
-
-#: src/account.c:1094
-msgid "New password (again)"
-msgstr "Nova contrasenya (repetiu-la)"
-
-#: src/account.c:1100
-#, c-format
-msgid "Change password for %s"
-msgstr "Canvia la contrasenya per a %s"
-
-#: src/account.c:1108
-msgid "Please enter your current password and your new password."
-msgstr "Introduïu la contrasenya actual, i la nova."
-
-#: src/account.c:1141
+#: ../src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr "Canvia la informació d'usuari de %s"
 
-#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
+#: ../src/account.c:401 ../src/gtkrequest.c:250
+#: ../src/protocols/jabber/buddy.c:514 ../src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Desa"
 
-#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
-#: src/protocols/novell/novell.c:2825
+#: ../src/account.c:760 ../src/gtkft.c:159 ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/blist.c:545
-msgid "buddy list"
-msgstr "llista d'amics"
-
-#: src/blist.c:1145
+#: ../src/away.c:233
+msgid "Away!"
+msgstr "Absent."
+
+#: ../src/away.c:303
+msgid "Edit This Message"
+msgstr "Edita aquest missatge"
+
+#: ../src/away.c:308
+msgid "I'm Back!"
+msgstr "He tornat."
+
+#: ../src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Esteu segur que voleu suprimir el missatge d'absència \"%s\"?"
+
+#: ../src/away.c:364 ../src/away.c:442
+msgid "Remove Away Message"
+msgstr "Suprimeix el missatge d'absència"
+
+#. Remove button
+#: ../src/away.c:366 ../src/gtkconv.c:1535 ../src/gtkconv.c:3917
+#: ../src/gtkconv.c:3988 ../src/gtkrequest.c:249
+msgid "Remove"
+msgstr "Suprimeix"
+
+#: ../src/away.c:436
+msgid "New Away Message"
+msgstr "Missatge d'absència nou"
+
+#: ../src/away.c:663
+msgid "Set All Away"
+msgstr "Passa'ls tots a absent"
+
+#: ../src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr "No es pot desar un missatge d'absència amb un títol en blanc"
+
+#: ../src/away.c:772
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+"Indiqueu un títol per al missatge, o escolliu \"Usa\" per usar-lo sense "
+"desar."
+
+#: ../src/away.c:782
+msgid "You cannot create an empty away message"
+msgstr "No es pot crear un missatge d'absència buit"
+
+#: ../src/away.c:847
+msgid "New away message"
+msgstr "Missatge d'absència nou"
+
+#: ../src/away.c:862
+msgid "Away title: "
+msgstr "Motiu de l'absència: "
+
+#: ../src/away.c:910
+msgid "_Save"
+msgstr "De_sa"
+
+#: ../src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "Desa i _fes servir"
+
+#: ../src/away.c:918
+msgid "_Use"
+msgstr "_Usa"
+
+#: ../src/blist.c:682
 msgid "Chats"
 msgstr "Xats"
 
-#: src/blist.c:1835
+#: ../src/blist.c:1357
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1511,93 +1476,119 @@
 "No s'han suprimit %d amics del grup %s perquè no estaven connectats. No "
 "s'han suprimit ni els amics ni el grup.\n"
 
-#: src/blist.c:1844
+#: ../src/blist.c:1366
 msgid "Group not removed"
 msgstr "No s'ha suprimit el grup"
 
-#: src/connection.c:98
+#: ../src/blist.c:2069
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"S'ha produït un error en analitzar la vostra llista d'amics. No s'ha "
+"carregat, i s'ha reanomenat el fitxer antic com a blist.xml~."
+
+#: ../src/blist.c:2072
+msgid "Buddy List Error"
+msgstr "Error en la llista d'amics"
+
+#: ../src/connection.c:118 ../src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "No s'ha trobat el connector per al protocol %s"
+
+#: ../src/connection.c:123
 msgid "Registration Error"
 msgstr "Error en el registre"
 
-#: src/conversation.c:237
-#, fuzzy
-msgid "Unable to send message: The message is too large."
+#: ../src/connection.c:174
+msgid "Connection Error"
+msgstr "Error de connexió"
+
+#: ../src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Entreu la contrasenya per a %s (%s)"
+
+#: ../src/conversation.c:233
+msgid "Unable to send message. The message is too large."
 msgstr "No s'ha pogut enviar el missatge. El missatge és massa llarg."
 
-#: src/conversation.c:240 src/conversation.c:253
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "No s'ha pogut enviar el missatge a %s."
-
-#: src/conversation.c:241
+#: ../src/conversation.c:237 ../src/conversation.c:251
+#: ../src/protocols/oscar/oscar.c:4248
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "No s'ha pogut enviar el missatge a %s:"
+
+#: ../src/conversation.c:239
 msgid "The message is too large."
 msgstr "El missatge és massa llarg."
 
-#: src/conversation.c:250
+#: ../src/conversation.c:248
 msgid "Unable to send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: src/conversation.c:1962
+#: ../src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrat a la sala."
 
-#: src/conversation.c:1965
+#: ../src/conversation.c:2073
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrat a la sala."
 
-#: src/conversation.c:2062
+#: ../src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ara us feu dir %s"
 
-#: src/conversation.c:2065
+#: ../src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s es fa dir %s"
 
-#: src/conversation.c:2107
+#: ../src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha sortit de la sala (%s)."
 
-#: src/conversation.c:2109
+#: ../src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha sortit de la sala."
 
-#: src/conversation.c:2186
+#: ../src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
 msgstr "(i %d més)"
 
-#: src/conversation.c:2188
+#: ../src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
 msgstr " ha sortit de la sala (%s)."
 
-#: src/conversation.c:2596
+#: ../src/conversation.c:2698
 msgid "Last created window"
 msgstr "Finestra creada per últim cop"
 
-#: src/conversation.c:2598
+#: ../src/conversation.c:2700
 msgid "Separate IM and Chat windows"
 msgstr "Separa les finestres de MI de les de xat."
 
-#: src/conversation.c:2600 src/gtkprefs.c:1279
+#: ../src/conversation.c:2702 ../src/gtkprefs.c:1387
 msgid "New window"
 msgstr "Nova finestra"
 
-#: src/conversation.c:2602
+#: ../src/conversation.c:2704
 msgid "By group"
 msgstr "Per grup"
 
-#: src/conversation.c:2604
+#: ../src/conversation.c:2706
 msgid "By account"
 msgstr "Per compte"
 
-#: src/ft.c:150 src/protocols/msn/msn.c:369
+#: ../src/ft.c:148 ../src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1606,7 +1597,7 @@
 "Error en llegir %s: \n"
 "%s.\n"
 
-#: src/ft.c:154
+#: ../src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1615,7 +1606,7 @@
 "Error en escriure %s: \n"
 "%s.\n"
 
-#: src/ft.c:158
+#: ../src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1624,35 +1615,35 @@
 "Error en accedir %s: \n"
 "%s.\n"
 
-#: src/ft.c:191
+#: ../src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "No es pot enviar un fitxer de 0 octets."
 
-#: src/ft.c:201
+#: ../src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "No es pot enviar un directori."
 
-#: src/ft.c:210
+#: ../src/ft.c:208
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no és un fitxer normal, no se sobreescriurà.\n"
 
-#: src/ft.c:268
+#: ../src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s us vol enviar %s (%s)"
 
-#: src/ft.c:275
+#: ../src/ft.c:273
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s us vol enviar un fitxer"
 
-#: src/ft.c:316
+#: ../src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Voleu acceptar la transferència del fitxer de %s?"
 
-#: src/ft.c:320
+#: ../src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1663,85 +1654,80 @@
 "Ordinador remot: %s\n"
 "Port remot: %d"
 
-#: src/ft.c:344
-#, fuzzy, c-format
+#: ../src/ft.c:338
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "S'està oferint enviar %s a %s"
-
-#: src/ft.c:384
+msgstr "%s us ofereix enviar el fitxer %s"
+
+#: ../src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no és un nom de fitxer vàlid.\n"
 
-#: src/ft.c:405
+#: ../src/ft.c:395
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "S'està oferint enviar %s a %s"
 
-#: src/ft.c:416
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Voleu acceptar la transferència del fitxer de %s?"
-
-#: src/ft.c:570
+#: ../src/ft.c:890
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferència del fitxer %s"
 
-#: src/ft.c:573
+#: ../src/ft.c:893
 msgid "File transfer complete"
 msgstr "S'ha completat la transferència del fitxer"
 
-#: src/ft.c:957
+#: ../src/ft.c:942
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Heu cancel·lat la transferència de %s"
 
-#: src/ft.c:962
+#: ../src/ft.c:948
 msgid "File transfer cancelled"
 msgstr "S'ha cancel·lat la transferència del fitxer"
 
-#: src/ft.c:1019
+#: ../src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha cancel·lat la transferència de %s"
 
-#: src/ft.c:1024
+#: ../src/ft.c:1007
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha cancel·lat la transferència del fitxer"
 
-#: src/ft.c:1081
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
+#: ../src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
 msgstr "S'ha avortat la transferència del fitxer a %s.\n"
 
-#: src/ft.c:1083
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
+#: ../src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
 msgstr "S'ha avortat la transferència del fitxer de %s.\n"
 
-#: src/gaim-remote.c:104
-#, fuzzy, c-format
+#: ../src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "Mida de l'expansor"
+
+#: ../src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "Mida de la fletxa d'expansió"
+
+#: ../src/gaim-remote.c:108
+#, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -m, --message=MESG       Message to send or show in conversation "
-"window\n"
-"       -t, --to=SCREENNAME      Select a target for command\n"
-"       -p, --protocol=PROTO     Specify protocol to use\n"
-"       -f, --from=SCREENNAME    Specify screen name to use\n"
-"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Ús: %s ordre [OPCIONS] [URI]\n"
@@ -1756,24 +1742,15 @@
 "    OPCIONS:\n"
 "      -h, --help [ordre] Mostra una ajuda per a l'ordre\n"
 
-#: src/gaim-remote.c:195
-#, fuzzy, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: ../src/gaim-remote.c:185 ../src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
 "El Gaim no s'està executant (en la sessió 0)\n"
 "Ja heu carregat el controlador \"Control remot\"?\n"
 
-#: src/gaim-remote.c:282
-msgid ""
-"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-"greater than 9999 chars\n"
-msgstr ""
-"No hi ha prou arguments (-t, -f, -p, i -m en requereixen) o els arguments "
-"contenen més de 9999 caràcters\n"
-
-#: src/gaim-remote.c:293
+#: ../src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1817,15 +1794,7 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Pingüí\n"
 "...sol·licita a 'Pingüí' afegir-lo a la llista d'amics.\n"
 
-#: src/gaim-remote.c:313
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr ""
-"\n"
-"Desconnecta tots els comptes\n"
-
-#: src/gaim-remote.c:317
+#: ../src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1833,7 +1802,7 @@
 "\n"
 "Tanca la instància en execució del Gaim\n"
 
-#: src/gaim-remote.c:321
+#: ../src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1841,7 +1810,7 @@
 "\n"
 "Posa el missatge per defecte d'\"absent\" a tots els comptes.\n"
 
-#: src/gaim-remote.c:325
+#: ../src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1849,15 +1818,7 @@
 "\n"
 "Treu el missatge d'absència de tots els comptes.\n"
 
-#: src/gaim-remote.c:329
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr ""
-"\n"
-"Envia missatge instantani\n"
-
-#: src/gtkaccount.c:345
+#: ../src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1869,153 +1830,166 @@
 "<b>Mida de la imatge:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:665
+#: ../src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Opcions d'entrada"
 
-#: src/gtkaccount.c:682 src/gtkft.c:626
+#: ../src/gtkaccount.c:655 ../src/gtkft.c:585
 msgid "Protocol:"
 msgstr "Protocol:"
 
 # Mozilla 1.3->ScreenName.label
-#: src/gtkaccount.c:687 src/gtkblist.c:4369
+#: ../src/gtkaccount.c:660 ../src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "Nom d'usuari:"
 
-#: src/gtkaccount.c:760
+#: ../src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
+#: ../src/gtkaccount.c:738 ../src/gtkblist.c:4172 ../src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "Àlies:"
 
-#: src/gtkaccount.c:769
+#: ../src/gtkaccount.c:742
 msgid "Remember password"
-msgstr "Recorda la constrasenya"
+msgstr "Recorda la contrasenya"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:814
+#: ../src/gtkaccount.c:798
 msgid "User Options"
 msgstr "Opcions d'usuari"
 
-#: src/gtkaccount.c:827
+#: ../src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "Notifica si hi ha nou correu"
 
-#: src/gtkaccount.c:836
+#: ../src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "Icona de l'amic:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:925
+#: ../src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "Opcions de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
+#: ../src/gtkaccount.c:1048 ../src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Usa les opcions globals per al servidor intermediari"
 
 #. No Proxy
-#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
+#: ../src/gtkaccount.c:1054 ../src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "Sense servidor intermediari"
 
 #. HTTP
-#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
+#: ../src/gtkaccount.c:1060 ../src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
+#: ../src/gtkaccount.c:1066 ../src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
+#: ../src/gtkaccount.c:1072 ../src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
+#: ../src/gtkaccount.c:1078 ../src/gtkaccount.c:1130 ../src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "Usa les opcions de l'entorn"
 
-#: src/gtkaccount.c:1184
+#: ../src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "podeu veure les papallones aparellant-se"
 
-#: src/gtkaccount.c:1188
+#: ../src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "Si mireu de ben a prop"
 
-#: src/gtkaccount.c:1204
+#: ../src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Opcions del servidor intermediari"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
+#: ../src/gtkaccount.c:1207 ../src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
+#: ../src/gtkaccount.c:1216 ../src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Ordinador:"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
+#: ../src/gtkaccount.c:1220 ../src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1243
+#: ../src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Nom d'usuari:"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
+#: ../src/gtkaccount.c:1233 ../src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "_Contrasenya:"
 
-#: src/gtkaccount.c:1625
+#: ../src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "Afegeix compte"
 
-#: src/gtkaccount.c:1627
+#: ../src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "Modifica compte"
 
+#. Add the disclosure
+#: ../src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "Mostra més opcions"
+
+#: ../src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "Mostra menys opcions"
+
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
+#: ../src/gtkaccount.c:1658 ../src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "Registra"
 
-#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
+#: ../src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
-#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: ../src/gtkaccount.c:2028 ../src/gtkrequest.c:247
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4420
+#: ../src/gtkaccount.c:2142 ../src/protocols/oscar/oscar.c:4332
 msgid "Screen Name"
 msgstr "Nom d'usuari"
 
-#: src/gtkaccount.c:2115
-msgid "Enabled"
-msgstr "Habilitat"
-
-#: src/gtkaccount.c:2123
+#: ../src/gtkaccount.c:2166 ../src/protocols/jabber/jabber.c:996
+#: ../src/protocols/oscar/oscar.c:691 ../src/protocols/oscar/oscar.c:5800
+#: ../src/protocols/oscar/oscar.c:6998 ../src/protocols/silc/silc.c:45
+#: ../src/protocols/yahoo/yahoo.c:2784 ../src/protocols/zephyr/zephyr.c:2110
+#: ../src/protocols/zephyr/zephyr.c:2129
+msgid "Online"
+msgstr "En línia"
+
+#: ../src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2466
+#. XXX: Tidy this up when not in string freeze
+#: ../src/gtkaccount.c:2521 ../src/protocols/jabber/presence.c:202
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha fet a %s un dels seus amics%s%s%s"
 
-#: src/gtkaccount.c:2480
+#: ../src/gtkaccount.c:2535 ../src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
@@ -2025,234 +1999,248 @@
 "\n"
 "Voleu afegir-lo a la llista d'amics?"
 
-#: src/gtkaccount.c:2488
+#: ../src/gtkaccount.c:2561
+msgid "Information"
+msgstr "Informació"
+
+#: ../src/gtkaccount.c:2565 ../src/gtkaccount.c:2596
+#: ../src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr "Voleu afegir l'amic a la llista?"
 
-#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: ../src/gtkaccount.c:2567 ../src/gtkaccount.c:2598 ../src/gtkblist.c:4571
+#: ../src/gtkconv.c:1537 ../src/gtkconv.c:3910 ../src/gtkconv.c:3981
+#: ../src/gtkrequest.c:248 ../src/protocols/icq/gaim_icq.c:276
+#: ../src/protocols/jabber/presence.c:212 ../src/protocols/oscar/oscar.c:3959
+#: ../src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/gtkblist.c:888
+#: ../src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr "Entra a un xat"
 
-#: src/gtkblist.c:909
+#: ../src/gtkblist.c:867
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Entreu la informació necessària sobre el xat al que vulgueu entrar.\n"
 
-#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:878 ../src/gtkpounce.c:415 ../src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Compte:"
 
 # Això és el botó, alerta l'amplada!
-#: src/gtkblist.c:1225
+#: ../src/gtkblist.c:1173 ../src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "_Informa"
 
-#: src/gtkblist.c:1228
+#: ../src/gtkblist.c:1176 ../src/gtkblist.c:3313
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1234
+#: ../src/gtkblist.c:1182
 msgid "_Send File"
 msgstr "_Envia un fitxer"
 
-#: src/gtkblist.c:1240
+#: ../src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
 msgstr "Afegeix un avís _per a l'amic"
 
-#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
-#: src/gtkblist.c:1369
+#: ../src/gtkblist.c:1190 ../src/gtkblist.c:1287
 msgid "View _Log"
 msgstr "Visua_litza el registre"
 
-#: src/gtkblist.c:1259
+#: ../src/gtkblist.c:1200
 msgid "_Alias Buddy..."
 msgstr "Pos_a un àlies a un amic..."
 
-#: src/gtkblist.c:1261
+#: ../src/gtkblist.c:1202
 msgid "_Remove Buddy"
 msgstr "Sup_rimeix un amic"
 
-#: src/gtkblist.c:1263
+#: ../src/gtkblist.c:1204
 msgid "Alias Contact..."
 msgstr "Posa un àlies a un contacte..."
 
-#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
+#: ../src/gtkblist.c:1207 ../src/gtkdialogs.c:877 ../src/gtkdialogs.c:879
 msgid "Remove Contact"
 msgstr "Suprimeix un contacte"
 
-#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
+#: ../src/gtkblist.c:1211 ../src/gtkblist.c:1295 ../src/gtkblist.c:1309
 msgid "_Alias..."
 msgstr "À_lies..."
 
-#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
-#: src/gtkconn.c:171
+#: ../src/gtkblist.c:1213 ../src/gtkblist.c:1297 ../src/gtkblist.c:1314
+#: ../src/gtkconn.c:367
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: src/gtkblist.c:1318
+#: ../src/gtkblist.c:1259
 msgid "Add a _Buddy"
 msgstr "_Afegeix un amic"
 
-#: src/gtkblist.c:1320
+#: ../src/gtkblist.c:1261
 msgid "Add a C_hat"
 msgstr "A_fegeix un xat"
 
-#: src/gtkblist.c:1322
+#: ../src/gtkblist.c:1263
 msgid "_Delete Group"
 msgstr "_Suprimeix un grup"
 
-#: src/gtkblist.c:1324
+#: ../src/gtkblist.c:1265
 msgid "_Rename"
 msgstr "_Canvia el nom"
 
 # Gnome_2.6_Extras [gossip.HEAD.ca.po]
 #. join button
-#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:102
+#: ../src/gtkblist.c:1283 ../src/gtkroomlist.c:264 ../src/gtkroomlist.c:409
+#: ../src/stock.c:88
 msgid "_Join"
 msgstr "En_tra"
 
-#: src/gtkblist.c:1344
+#: ../src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr "Entra automàticament"
 
-#: src/gtkblist.c:1382 src/gtkblist.c:1405
+#: ../src/gtkblist.c:1311 ../src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr "_Redueix"
 
-#: src/gtkblist.c:1410
+#: ../src/gtkblist.c:1341
 msgid "_Expand"
 msgstr "_Expandeix"
 
-#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
-#: src/gtkblist.c:3649
-msgid "/Tools/Mute Sounds"
-msgstr "/Eines/Deshabilita els sons"
-
-#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
+#: ../src/gtkblist.c:2016 ../src/gtkconv.c:4553 ../src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti afegir aquest amic."
 
 #. Buddies menu
-#: src/gtkblist.c:2675
+#: ../src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/_Amics"
 
-#: src/gtkblist.c:2676
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amics/Missatge _instantani nou..."
 
-#: src/gtkblist.c:2677
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amics/Entra a un _xat..."
 
-#: src/gtkblist.c:2678
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
-msgstr "/Amics/Obtingues informació de l'_usuari..."
-
-#: src/gtkblist.c:2679
+msgstr "/Amics/Aconsegueix informació de l'_usuari..."
+
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/View User _Log..."
 msgstr "/Amics/Visua_litza el registre de l'usuari..."
 
-#: src/gtkblist.c:2681
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amics/Mostra amics desc_onnectats"
 
-#: src/gtkblist.c:2682
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amics/Mostra grups _buits"
 
-#: src/gtkblist.c:2683
+#: ../src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amics/_Afegeix un amic..."
 
-#: src/gtkblist.c:2684
+#: ../src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amics/Afegeix un _xat..."
 
-#: src/gtkblist.c:2685
+#: ../src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Amics/Afegeix un _grup..."
 
-#: src/gtkblist.c:2687
+#: ../src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/Amics/_Desconnecta"
+
+#: ../src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/Amics/_Surt"
 
 #. Tools
-#: src/gtkblist.c:2690
+#: ../src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/_Eines"
 
-#: src/gtkblist.c:2691
+#: ../src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/Eines/_Absent"
+
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Eines/Avís _per a amics"
 
-#: src/gtkblist.c:2692
+#: ../src/gtkblist.c:2456
 msgid "/Tools/Account Ac_tions"
 msgstr "/Eines/Accions dels comp_tes"
 
-#: src/gtkblist.c:2693
+#: ../src/gtkblist.c:2457
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Eines/Acci_ons del connector"
 
-#: src/gtkblist.c:2695
-msgid "/Tools/_Statuses"
-msgstr "/Eines/_Estats"
-
-#: src/gtkblist.c:2696
+#: ../src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/Eines/_Comptes"
 
-#: src/gtkblist.c:2697
-msgid "/Tools/Pr_eferences"
-msgstr "/Eines/Pr_eferències"
-
-#: src/gtkblist.c:2698
-msgid "/Tools/Pr_ivacy"
-msgstr "/Eines/_Privadesa"
-
-#: src/gtkblist.c:2699
+#: ../src/gtkblist.c:2460
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/Transferència de _fitxers"
 
-#: src/gtkblist.c:2700
+#: ../src/gtkblist.c:2461
 msgid "/Tools/R_oom List"
 msgstr "/Eines/_Llista de sales"
 
-#: src/gtkblist.c:2702
-msgid "/Tools/Mute _Sounds"
-msgstr "/Eines/Deshabilita els _sons"
-
-#: src/gtkblist.c:2703
+#: ../src/gtkblist.c:2462
+msgid "/Tools/Pr_eferences"
+msgstr "/Eines/Pr_eferències"
+
+#: ../src/gtkblist.c:2463
+msgid "/Tools/Pr_ivacy"
+msgstr "/Eines/_Privadesa"
+
+#: ../src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/Eines/Visua_litza el registre del sistema"
 
 #. Help
-#: src/gtkblist.c:2706
+#: ../src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2707
+#: ../src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda en línia"
 
-#: src/gtkblist.c:2708
+#: ../src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
-#: src/gtkblist.c:2709
+#: ../src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: src/gtkblist.c:2741 src/gtkblist.c:2808
+#: ../src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "Reanomena el grup"
+
+#: ../src/gtkblist.c:2489
+msgid "New group name"
+msgstr "Nom de grup nou"
+
+#: ../src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "Entreu un nou nom per al grup seleccionat."
+
+#: ../src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -2261,61 +2249,7 @@
 "\n"
 "<b>Compte:</b> %s"
 
-#: src/gtkblist.c:2817
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Àlies del contacte:</b>"
-
-#: src/gtkblist.c:2825
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Àlies:</b>"
-
-#: src/gtkblist.c:2833
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Sobrenom:</b>"
-
-#: src/gtkblist.c:2842
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Connectat:</b>"
-
-#: src/gtkblist.c:2854
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Inactiu:</b> %s"
-
-#: src/gtkblist.c:2889
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Vist per darrera vegada:</b> fa %s"
-
-#: src/gtkblist.c:2897
+#: ../src/gtkblist.c:2585
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2323,7 +2257,68 @@
 "\n"
 "<b>Estat:</b> Desconnectat"
 
-#: src/gtkblist.c:2919
+#: ../src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Compte:</b>"
+
+#: ../src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Àlies del contacte:</b>"
+
+#: ../src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Àlies:</b>"
+
+#: ../src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Sobrenom:</b>"
+
+#: ../src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Connectat:</b>"
+
+#: ../src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>Inactiu:</b>"
+
+#: ../src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>Avisat:</b>"
+
+#: ../src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2331,121 +2326,124 @@
 "\n"
 "<b>Descripció:</b> Xerraire"
 
-#: src/gtkblist.c:2921
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
+#: ../src/gtkblist.c:2625
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
 "<b>Estat</b>: Imponent"
 
-#: src/gtkblist.c:2923
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
+#: ../src/gtkblist.c:2626
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
 "<b>Estat</b>: De conya"
 
-#: src/gtkblist.c:3185
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+#: ../src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "Inactiu (%d h i %02d min) "
 
-#: src/gtkblist.c:3187
+#: ../src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactiu (%d min) "
 
-#: src/gtkblist.c:3190
-msgid "Idle "
-msgstr "Inactiu "
-
-#: src/gtkblist.c:3194
+#: ../src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "Avisat (%d%%) "
+
+#: ../src/gtkblist.c:2918
 msgid "Offline "
 msgstr "Fora de línia "
 
-#: src/gtkblist.c:3310
-msgid "/Buddies/New Instant Message..."
-msgstr "/Amics/Missatge instantani nou..."
-
-#: src/gtkblist.c:3311 src/gtkblist.c:3345
+#. Make menu items sensitive/insensitive where appropriate
+#: ../src/gtkblist.c:3036
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amics/Entra a un xat..."
 
-#: src/gtkblist.c:3312
-msgid "/Buddies/Get User Info..."
-msgstr "/Amics/Obtingues informació de l'usuari..."
-
-#: src/gtkblist.c:3313
-msgid "/Buddies/Add Buddy..."
-msgstr "/Amics/Afegeix un amic..."
-
-#: src/gtkblist.c:3314
-msgid "/Buddies/Add Chat..."
-msgstr "/Amics/Afegeix un xat..."
-
-#: src/gtkblist.c:3315
-msgid "/Buddies/Add Group..."
-msgstr "/Amics/Afegeix un grup..."
-
-#: src/gtkblist.c:3348
+#: ../src/gtkblist.c:3039
 msgid "/Tools/Room List"
 msgstr "/Eines/Llista de sales"
 
-#: src/gtkblist.c:3351
+#: ../src/gtkblist.c:3042
 msgid "/Tools/Privacy"
 msgstr "/Eines/Privadesa"
 
-#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
-#: src/protocols/yahoo/yahoo.c:2749
-msgid "None"
-msgstr "Cap"
-
-#: src/gtkblist.c:3429
+#: ../src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr "Alfabèticament"
 
-#: src/gtkblist.c:3430
+#: ../src/gtkblist.c:3125
 msgid "By status"
 msgstr "Per estat"
 
-#: src/gtkblist.c:3431
+#: ../src/gtkblist.c:3126
 msgid "By log size"
 msgstr "Per la mida del registre"
 
-#: src/gtkblist.c:3542
+#: ../src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/Eines/Absent"
+
+#: ../src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr "/Eines/Avís de l'amic"
 
-#: src/gtkblist.c:3543
+#: ../src/gtkblist.c:3198
 msgid "/Tools/Account Actions"
 msgstr "/Eines/Accions del compte"
 
-#: src/gtkblist.c:3544
+#: ../src/gtkblist.c:3201
 msgid "/Tools/Plugin Actions"
 msgstr "/Eines/Accions del connector"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3642
+#: ../src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amics/Mostra amics desconnectats"
 
-#: src/gtkblist.c:3644
+#: ../src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amics/Mostra grups buits"
 
-#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
-#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
+#: ../src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "Envia un missatge a l'amic seleccionat"
+
+#: ../src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#: ../src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "_Xat"
+
+#: ../src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "Entra a una sala"
+
+#: ../src/gtkblist.c:3343
+msgid "_Away"
+msgstr "_Absent"
+
+#: ../src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "Estableix un missatge d'absència"
+
+#: ../src/gtkblist.c:4112 ../src/protocols/silc/buddy.c:731
+#: ../src/protocols/silc/buddy.c:989 ../src/protocols/silc/buddy.c:1034
+#: ../src/protocols/silc/buddy.c:1124 ../src/protocols/yahoo/yahoo.c:2951
 msgid "Add Buddy"
 msgstr "Afegeix un amic"
 
-#: src/gtkblist.c:4347
+#: ../src/gtkblist.c:4136
 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. "
@@ -2456,25 +2454,25 @@
 "sobrenom substituirà el nom d'usuari allà on sigui possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4410 src/gtkblist.c:4742
+#: ../src/gtkblist.c:4196 ../src/gtkblist.c:4499
 msgid "Account:"
 msgstr "Compte:"
 
-#: src/gtkblist.c:4675
+#: ../src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr "Aquest protocol no implementa sales de xat."
 
-#: src/gtkblist.c:4691
+#: ../src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "No esteu connectat amb cap protocol que permeti fer xats."
 
-#: src/gtkblist.c:4708
+#: ../src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "Afegeix xat"
 
-#: src/gtkblist.c:4732
+#: ../src/gtkblist.c:4489
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2482,24 +2480,39 @@
 "Entreu un àlies i la informació addient sobre el xat que vulgueu afegir a la "
 "llista d'amics.\n"
 
-#: src/gtkblist.c:4811
+#: ../src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "Afegeix un grup"
 
-#: src/gtkblist.c:4812
+#: ../src/gtkblist.c:4569
 msgid "Please enter the name of the group to be added."
 msgstr "Entreu el nom del grup que vulgueu afegir."
 
-#: src/gtkblist.c:5362 src/gtkblist.c:5458
+#: ../src/gtkblist.c:5138 ../src/gtkblist.c:5235
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
-#: src/gtkconn.c:171
-#, fuzzy
-msgid "Reconnect"
+#: ../src/gtkconn.c:79 ../src/gtkconn.c:250 ../src/gtkconn.c:261
+msgid "Done."
+msgstr "Fet."
+
+#: ../src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Connexió: "
+
+#: ../src/gtkconn.c:204
+msgid "Signon"
+msgstr "Connexió"
+
+#: ../src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Cancel·la-ho tot"
+
+#: ../src/gtkconn.c:367 ../src/gtkconn.c:600
+msgid "_Reconnect"
 msgstr "To_rna a connectar"
 
-#: src/gtkconn.c:368
+#: ../src/gtkconn.c:564
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2512,50 +2525,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:370
+#: ../src/gtkconn.c:566
 msgid "Reason Unknown."
 msgstr "No se'n coneix el motiu."
 
-#: src/gtkconn.c:378
-msgid "Disconnected"
-msgstr "Desconnectat"
-
-#: src/gtkconn.c:404
-msgid "_Reconnect"
-msgstr "To_rna a connectar"
-
-#: src/gtkconn.c:409
+#: ../src/gtkconn.c:605
 msgid "Reconnect _All"
 msgstr "Connect_a'ls tots de nou"
 
-#: src/gtkconn.c:439
+#: ../src/gtkconn.c:635
 msgid "Time"
 msgstr "Temps"
 
-#: src/gtkconv.c:148
-#, fuzzy
-msgid "Confirm close"
-msgstr "Confirma el compte"
-
-#: src/gtkconv.c:180
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Esteu segur que voleu suprimir %s?"
-
-#: src/gtkconv.c:410
+#: ../src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me fa servir el Gaim v%s."
 
-#: src/gtkconv.c:419
+#: ../src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr "Les opcions de depuració disponibles són:  version"
 
-#: src/gtkconv.c:456
+#: ../src/gtkconv.c:390
 msgid "No such command (in this context)."
 msgstr "L'ordre no existeix (en aquest context)."
 
-#: src/gtkconv.c:459
+#: ../src/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2563,50 +2558,47 @@
 "Feu servir \"/help &lt;ordre&gt;\" per obtenir ajuda sobre una ordre.\n"
 "Les següents ordres estan disponibles en aquest context:\n"
 
-#: src/gtkconv.c:531
+#: ../src/gtkconv.c:465
 msgid "No such command."
 msgstr "No existeix l'ordre."
 
-#: src/gtkconv.c:538
+#: ../src/gtkconv.c:472
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error de sintaxi: Heu escrit un nombre d'arguments equivocat per a aquesta "
 "ordre."
 
-#: src/gtkconv.c:543
+#: ../src/gtkconv.c:477
 msgid "Your command failed for an unknown reason."
 msgstr "L'ordre ha fallat per motius desconeguts."
 
-#: src/gtkconv.c:550
-#, fuzzy
-msgid "That command only works in chats, not IMs."
+#: ../src/gtkconv.c:484
+msgid "That command only works in Chats, not IMs."
 msgstr "Aquesta ordre només funciona en xats, i no en MI."
 
-#: src/gtkconv.c:553
-#, fuzzy
-msgid "That command only works in IMs, not chats."
+#: ../src/gtkconv.c:487
+msgid "That command only works in IMs, not Chats."
 msgstr "Aquesta ordre només funciona en MI, i no en xats."
 
-#: src/gtkconv.c:557
+#: ../src/gtkconv.c:491
 msgid "That command doesn't work on this protocol."
 msgstr "Aquesta ordre no funciona per a aquest protocol."
 
-#: src/gtkconv.c:783 src/gtkconv.c:809
-#, fuzzy
-msgid "That buddy is not on the same protocol as this chat."
+#: ../src/gtkconv.c:734 ../src/gtkconv.c:760
+msgid "That buddy is not on the same protocol as this chat"
 msgstr "L'amic no està en el mateix protocol que aquest xat"
 
-#: src/gtkconv.c:803
+#: ../src/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti convidar aquest amic."
 
-#: src/gtkconv.c:858
+#: ../src/gtkconv.c:808
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:888
+#: ../src/gtkconv.c:838
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2614,290 +2606,349 @@
 "Entreu el nom de l'usuari que vulgueu convidar, així com un missatge "
 "d'invitació opcional."
 
-#: src/gtkconv.c:909
+#: ../src/gtkconv.c:859
 msgid "_Buddy:"
 msgstr "_Amic:"
 
-#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
+#: ../src/gtkconv.c:879
 msgid "_Message:"
 msgstr "_Missatge:"
 
-#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
+#: ../src/gtkconv.c:935 ../src/gtkconv.c:2660 ../src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "No s'ha pogut obrir el fitxer."
 
-#: src/gtkconv.c:992
+#: ../src/gtkconv.c:940
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa amb %s</h1>\n"
 
-#: src/gtkconv.c:1016
+#: ../src/gtkconv.c:954
 msgid "Save Conversation"
 msgstr "Desa la conversa"
 
-#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
+#: ../src/gtkconv.c:1039 ../src/gtkdebug.c:131
 msgid "Find"
 msgstr "Cerca"
 
-#: src/gtkconv.c:1143 src/gtkdebug.c:191
+#: ../src/gtkconv.c:1065 ../src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: src/gtkconv.c:1541
+#: ../src/gtkconv.c:1481
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
+#. Send File button
+#: ../src/gtkconv.c:1490 ../src/gtkconv.c:3903
+#: ../src/protocols/oscar/oscar.c:606
 msgid "Send File"
 msgstr "Envia un fitxer"
 
-#: src/gtkconv.c:1554
+#: ../src/gtkconv.c:1499
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
-#: src/gtkconv.c:1557
+#: ../src/gtkconv.c:1501 ../src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Ignora"
 
-#: src/gtkconv.c:1562
+#. Info button
+#: ../src/gtkconv.c:1510 ../src/gtkconv.c:3924
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1568
-#, fuzzy
-msgid "Get Away Message"
-msgstr "Missatge d'absència nou"
-
-#: src/gtkconv.c:1577 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "Suprimeix"
-
-#: src/gtkconv.c:2644
+#: ../src/gtkconv.c:1519
+msgid "Get Away Msg"
+msgstr "Aconsegueix el missatge d'absència"
+
+#: ../src/gtkconv.c:2668
 msgid "Unable to save icon file to disk."
 msgstr "No s'ha pogut desar el fitxer de la icona al disc."
 
-#: src/gtkconv.c:2667
+#: ../src/gtkconv.c:2690
 msgid "Save Icon"
 msgstr "Desa la icona"
 
-#: src/gtkconv.c:2695
+#: ../src/gtkconv.c:2720
 msgid "Animate"
 msgstr "Anima"
 
-#: src/gtkconv.c:2700
+#: ../src/gtkconv.c:2725
 msgid "Hide Icon"
 msgstr "Oculta la icona"
 
-#: src/gtkconv.c:2706
+#: ../src/gtkconv.c:2731
 msgid "Save Icon As..."
 msgstr "Anomena i desa la icona..."
 
-#: src/gtkconv.c:3067
+#: ../src/gtkconv.c:3108
 msgid "User is typing..."
 msgstr "L'usuari està escrivint..."
 
-#: src/gtkconv.c:3072
+#: ../src/gtkconv.c:3116
 msgid "User has typed something and paused"
 msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3173
+#: ../src/gtkconv.c:3219
 msgid "_Send As"
 msgstr "_Envia com a"
 
 #. Conversation menu
-#: src/gtkconv.c:3628
+#: ../src/gtkconv.c:3673
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:3630
+#: ../src/gtkconv.c:3675
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Missatge instantani nou..."
 
-#: src/gtkconv.c:3635
+#: ../src/gtkconv.c:3680
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Cerca..."
 
-#: src/gtkconv.c:3637
+#: ../src/gtkconv.c:3682
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Visualitza el _registre"
 
-#: src/gtkconv.c:3638
+#: ../src/gtkconv.c:3683
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/Anomena i _desa..."
 
-#: src/gtkconv.c:3640
+#: ../src/gtkconv.c:3685
 msgid "/Conversation/Clear"
 msgstr "/Conversa/_Neteja"
 
-#: src/gtkconv.c:3644
+#: ../src/gtkconv.c:3689
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#: src/gtkconv.c:3645
+#: ../src/gtkconv.c:3690
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Afegeix un a_vís per a l'amic..."
 
-#: src/gtkconv.c:3647
+#: ../src/gtkconv.c:3692
 msgid "/Conversation/_Get Info"
-msgstr "/Conversa/_Obtingues informació"
-
-#: src/gtkconv.c:3649
+msgstr "/Conversa/_Aconsegueix informació"
+
+#: ../src/gtkconv.c:3694
+msgid "/Conversation/_Warn..."
+msgstr "/Conversa/_Avisa..."
+
+#: ../src/gtkconv.c:3696
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
 
-#: src/gtkconv.c:3654
+#: ../src/gtkconv.c:3701
 msgid "/Conversation/Al_ias..."
-msgstr "/Conversa/À_lies..."
-
-#: src/gtkconv.c:3656
+msgstr "/Conversa/Àl_ies..."
+
+#: ../src/gtkconv.c:3703
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
-#: src/gtkconv.c:3658
+#: ../src/gtkconv.c:3705
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afegeix..."
 
-#: src/gtkconv.c:3660
+#: ../src/gtkconv.c:3707
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/Sup_rimeix..."
 
-#: src/gtkconv.c:3665
+#: ../src/gtkconv.c:3712
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversa/Inserta un _enllaç..."
-
-#: src/gtkconv.c:3667
+msgstr "/Conversa/Insereix un _enllaç..."
+
+#: ../src/gtkconv.c:3714
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Conversa/Inserta una _imatge..."
-
-#: src/gtkconv.c:3672
+msgstr "/Conversa/Insereix una _imatge..."
+
+#: ../src/gtkconv.c:3719
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Tanca"
 
 #. Options
-#: src/gtkconv.c:3676
+#: ../src/gtkconv.c:3723
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: src/gtkconv.c:3677
+#: ../src/gtkconv.c:3724
 msgid "/Options/Enable _Logging"
 msgstr "/Opcions/Habilita el _registre"
 
-#: src/gtkconv.c:3678
+#: ../src/gtkconv.c:3725
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcions/Habilita els _sons"
 
-#: src/gtkconv.c:3679
-#, fuzzy
-msgid "/Options/Show Formatting _Toolbars"
+#: ../src/gtkconv.c:3726
+msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Opcions/Mos_tra la barra d'eines per al format"
 
-#: src/gtkconv.c:3680
+#: ../src/gtkconv.c:3727
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Opcions/Mostra marques de _temps"
-
-#: src/gtkconv.c:3681
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcions/Mostra la icona de l'amic"
-
-#: src/gtkconv.c:3725
+msgstr "/Opcions/_Mostra les marques de temps"
+
+#: ../src/gtkconv.c:3769
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
-#: src/gtkconv.c:3731
+#: ../src/gtkconv.c:3774
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#: src/gtkconv.c:3735
+#: ../src/gtkconv.c:3778
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avís per a l'amic..."
 
-#: src/gtkconv.c:3741
+#: ../src/gtkconv.c:3784
 msgid "/Conversation/Get Info"
-msgstr "/Conversa/Obtingues informació"
-
-#: src/gtkconv.c:3745
+msgstr "/Conversa/Aconsegueix informació"
+
+#: ../src/gtkconv.c:3788
+msgid "/Conversation/Warn..."
+msgstr "/Conversa/Avisa..."
+
+#: ../src/gtkconv.c:3792
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convida..."
 
-#: src/gtkconv.c:3751
+#: ../src/gtkconv.c:3798
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Àlies..."
 
-#: src/gtkconv.c:3755
+#: ../src/gtkconv.c:3802
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloca"
 
-#: src/gtkconv.c:3759
+#: ../src/gtkconv.c:3806
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Afegeix..."
 
-#: src/gtkconv.c:3763
+#: ../src/gtkconv.c:3810
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Suprimeix..."
 
-#: src/gtkconv.c:3769
+#: ../src/gtkconv.c:3816
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Insereix un enllaç..."
 
-#: src/gtkconv.c:3773
+#: ../src/gtkconv.c:3820
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Insereix una imatge..."
 
-#: src/gtkconv.c:3779
+#: ../src/gtkconv.c:3826
 msgid "/Options/Enable Logging"
 msgstr "/Opcions/Habilita el registre"
 
-#: src/gtkconv.c:3782
+#: ../src/gtkconv.c:3829
 msgid "/Options/Enable Sounds"
 msgstr "/Opcions/Habilita els sons"
 
-#: src/gtkconv.c:3785
-#, fuzzy
-msgid "/Options/Show Formatting Toolbars"
+#: ../src/gtkconv.c:3832
+msgid "/Options/Show Formatting Toolbar"
 msgstr "/Opcions/Mostra la barra d'eines per al format"
 
-#: src/gtkconv.c:3788
+#: ../src/gtkconv.c:3835
 msgid "/Options/Show Timestamps"
 msgstr "/Opcions/Mostra les marques de temps"
 
-#: src/gtkconv.c:3791
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Mostra la icona de l'amic"
-
-#: src/gtkconv.c:3911
+#. The buttons, from left to right
+#. Warn button
+#: ../src/gtkconv.c:3889
+msgid "Warn"
+msgstr "Avisa"
+
+#: ../src/gtkconv.c:3890
+msgid "Warn the user"
+msgstr "Avisa l'usuari"
+
+#. Block button
+#: ../src/gtkconv.c:3896 ../src/gtkprivacy.c:634 ../src/gtkprivacy.c:645
+msgid "Block"
+msgstr "Bloca"
+
+#: ../src/gtkconv.c:3897
+msgid "Block the user"
+msgstr "Bloca l'usuari"
+
+#: ../src/gtkconv.c:3904
+msgid "Send a file to the user"
+msgstr "Envia un fitxer a l'usuari"
+
+#: ../src/gtkconv.c:3911
+msgid "Add the user to your buddy list"
+msgstr "Afegeix l'usuari a la llista d'amics"
+
+#: ../src/gtkconv.c:3918
+msgid "Remove the user from your buddy list"
+msgstr "Suprimeix l'usuari de la llista d'amics"
+
+#: ../src/gtkconv.c:3925 ../src/gtkconv.c:4260
+msgid "Get the user's information"
+msgstr "Aconsegueix informació de l'usuari"
+
+#. Send button
+#: ../src/gtkconv.c:3931 ../src/gtkconv.c:3995
+msgid "Send"
+msgstr "Envia"
+
+#: ../src/gtkconv.c:3932 ../src/gtkconv.c:3996
+msgid "Send message"
+msgstr "Envia el missatge"
+
+#. The buttons, from left to right
+#. Invite
+#: ../src/gtkconv.c:3974
+msgid "Invite"
+msgstr "Convida"
+
+#: ../src/gtkconv.c:3975
+msgid "Invite a user"
+msgstr "Convida un usuari"
+
+#: ../src/gtkconv.c:3982
+msgid "Add the chat to your buddy list"
+msgstr "Afegeix el xat a la llista d'amics"
+
+#: ../src/gtkconv.c:3989
+msgid "Remove the chat from your buddy list"
+msgstr "Suprimeix l'usuari de la llista d'amics"
+
+#: ../src/gtkconv.c:4113
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3959
+#: ../src/gtkconv.c:4176
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
-#: src/gtkconv.c:4021
+#: ../src/gtkconv.c:4237
 msgid "IM the user"
 msgstr "Envieu un MI a l'usuari"
 
-#: src/gtkconv.c:4034
+#: ../src/gtkconv.c:4249
 msgid "Ignore the user"
 msgstr "Ignora l'usuari"
 
-#: src/gtkconv.c:4046
-msgid "Get the user's information"
-msgstr "Obtingues informació de l'usuari"
-
-#: src/gtkconv.c:4569
+#: ../src/gtkconv.c:4848
 msgid "Close conversation"
 msgstr "Tanca la conversa"
 
-#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
+#: ../src/gtkconv.c:5385 ../src/gtkconv.c:5414 ../src/gtkconv.c:5510
+#: ../src/gtkconv.c:5568
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona a la sala"
 msgstr[1] "%d persones a la sala"
 
-#: src/gtkconv.c:6279
+#: ../src/gtkconv.c:6145 ../src/gtkconv.c:6148
+msgid "<main>/Conversation/Close"
+msgstr "<main>/Conversa/Tanca"
+
+#: ../src/gtkconv.c:6520
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2905,11 +2956,11 @@
 "say &lt;missatge&gt;: Envia un missatge normalment com si no fessiu servir "
 "cap ordre."
 
-#: src/gtkconv.c:6282
+#: ../src/gtkconv.c:6523
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;acció&gt;: Envia una acció a l'estil IRC a un amic o xat."
 
-#: src/gtkconv.c:6285
+#: ../src/gtkconv.c:6526
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2917,385 +2968,419 @@
 "debug &lt;opció&gt;: Envia informació de depuració diversa a la conversa "
 "actual."
 
-#: src/gtkconv.c:6288
-#, fuzzy
+#: ../src/gtkconv.c:6529
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s ha tancat la finestra de conversa."
-
-#: src/gtkconv.c:6291
+msgstr "clear: Neteja la conversa."
+
+#: ../src/gtkconv.c:6532
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;ordre&gt;: Ajuda específica quant a l'ordre."
 
-#: src/gtkdebug.c:230
+#: ../src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Desa el registre de depuració"
 
-#: src/gtkdebug.c:571
-#, fuzzy
-msgid "Invert"
-msgstr "_Insereix"
-
-#: src/gtkdebug.c:574
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:621
+#: ../src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Finestra de depuració"
 
-#: src/gtkdebug.c:674
-#, fuzzy
-msgid "Clear"
-msgstr "Tanca"
-
-#: src/gtkdebug.c:683
+#: ../src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/gtkdebug.c:690 src/gtkdebug.c:691
+#: ../src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Marques de temps"
 
-#: src/gtkdebug.c:709
-#, fuzzy
-msgid "Filter"
-msgstr "Ha fallat"
-
-#: src/gtkdebug.c:722
-#, fuzzy
-msgid "Right click for more options."
-msgstr "Mostra més opcions"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
+#: ../src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr "desenvolupador 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:64 ../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 ../src/gtkdialogs.c:75
 msgid "developer"
 msgstr "desenvolupador"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr "desenvolupador i mantenidor de la pàgina web"
 
-#: src/gtkdialogs.c:62
+#: ../src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr "adaptació a win32"
 
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "suport"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+#: ../src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "mantenidor"
 
-#: src/gtkdialogs.c:88
-#, fuzzy
-msgid "libfaim maintainer"
+#: ../src/gtkdialogs.c:92
+msgid "former libfaim maintainer"
 msgstr "antic mantenidor de libfaim"
 
-#: src/gtkdialogs.c:91
-#, fuzzy
-msgid "Jabber developer"
+#: ../src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr "antic desenvolupador principal"
+
+#: ../src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "antic mantenidor"
+
+#: ../src/gtkdialogs.c:95
+msgid "former Jabber developer"
 msgstr "antic desenvolupador de Jabber"
 
-#: src/gtkdialogs.c:92
+#: ../src/gtkdialogs.c:96
 msgid "original author"
 msgstr "autor original"
 
-#: src/gtkdialogs.c:93
+#: ../src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker i conductor designat"
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:102
+msgid "Azerbaijani"
+msgstr "Àzeri"
+
+#: ../src/gtkdialogs.c:103 ../src/gtkdialogs.c:150
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "Vladimira Girginova i Vladimir (Kaladan) Petkov"
+
+#: ../src/gtkdialogs.c:104 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
 msgid "Catalan"
 msgstr "Català"
 
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:105 ../src/gtkdialogs.c:153
 msgid "Czech"
 msgstr "Txec"
 
-#: src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:106
 msgid "Danish"
 msgstr "Danès"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:154
 msgid "German"
 msgstr "Alemany"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:108
 msgid "Australian English"
 msgstr "Anglès d'Austràlia"
 
-#: src/gtkdialogs.c:105
+#: ../src/gtkdialogs.c:109
+msgid "Canadian English"
+msgstr "Anglès canadenc"
+
+#: ../src/gtkdialogs.c:110
 msgid "British English"
 msgstr "Anglès britànic"
 
-#: src/gtkdialogs.c:106
-msgid "Canadian English"
-msgstr "Anglès canadenc"
-
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:155
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112
+msgid "Estonian"
+msgstr "Estoni"
+
+#: ../src/gtkdialogs.c:113 ../src/gtkdialogs.c:156
 msgid "Finnish"
 msgstr "Finès"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:157
 msgid "French"
 msgstr "Francès"
 
-#: src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/gtkdialogs.c:111
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:158
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:159
 msgid "Hungarian"
-msgstr "Hungarès"
-
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
+msgstr "Hongarès"
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:160
 msgid "Italian"
 msgstr "Italià"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:161
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/gtkdialogs.c:115
+#: ../src/gtkdialogs.c:120
+msgid "Georgian"
+msgstr "Georgià"
+
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:162
+msgid "Korean"
+msgstr "Coreà"
+
+#: ../src/gtkdialogs.c:122
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: src/gtkdialogs.c:116
-#, fuzzy
-msgid "Georgian"
-msgstr "Alemany"
-
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
-msgid "Korean"
-msgstr "Coreà"
-
-#: src/gtkdialogs.c:118
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "Holandès; Flamenc"
-
-#: src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:124
+msgid "Burmese"
+msgstr "Birmà"
+
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:163
 msgid "Norwegian"
 msgstr "Noruec"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:126
+msgid "Dutch; Flemish"
+msgstr "Holandès; Flamenc"
+
+#: ../src/gtkdialogs.c:127
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruec (Nynorsk)"
+
+#: ../src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:164
 msgid "Polish"
 msgstr "Polonès"
 
-#: src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:130
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:131
 msgid "Portuguese-Brazil"
 msgstr "Portuguès de Brasil"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "Romanès"
 
-#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Russian"
 msgstr "Rus"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr "Eslovè"
+
+#: ../src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr "Albanès"
+
+#: ../src/gtkdialogs.c:136
 msgid "Serbian"
 msgstr "Serbi"
 
-#: src/gtkdialogs.c:129
-msgid "Slovenian"
-msgstr "Eslovè"
-
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "Suec"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../src/gtkdialogs.c:139
+msgid "Ukrainian"
+msgstr "Ucraïnès"
+
+#: ../src/gtkdialogs.c:140
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:140
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "Equip del Vi de Gnome i T.M.Thanh"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:141
+msgid "Xhosa"
+msgstr "Xosa"
+
+#: ../src/gtkdialogs.c:142
 msgid "Simplified Chinese"
 msgstr "Xinès simplificat"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:143
 msgid "Traditional Chinese"
 msgstr "Xinès tradicional"
 
-#: src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:149
 msgid "Amharic"
 msgstr "Amhàric"
 
-#: src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:167
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:170
+msgid "Chinese"
+msgstr "Xinès"
+
+#: ../src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "Quant al Gaim"
 
-#: src/gtkdialogs.c:223
-#, fuzzy
+#: ../src/gtkdialogs.c:227
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: ../src/gtkdialogs.c:249
 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 és un client modular de missatges instantanis capaç d'usar AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-"
-"Gadu, tots alhora. Està escrit usant GTK+ i roman sota llicència GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:232
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"El Gaim és un client modular de missatgeria instantània capaç d'usar AIM, "
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i "
+"Gadu-Gadu, tots alhora. Fa servir la biblioteca de programació Gtk+, i roman "
+"sota llicència GPL.<BR><BR>"
+
+#: ../src/gtkdialogs.c:259
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim a irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:235
+#: ../src/gtkdialogs.c:262
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim a irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:241
+#: ../src/gtkdialogs.c:268
 msgid "Active Developers"
 msgstr "Desenvolupadors actius"
 
-#: src/gtkdialogs.c:256
+#: ../src/gtkdialogs.c:283
 msgid "Crazy Patch Writers"
 msgstr "Esbojarrats escriptors de pedaços"
 
-#: src/gtkdialogs.c:271
+#: ../src/gtkdialogs.c:298
 msgid "Retired Developers"
 msgstr "Desenvolupadors retirats"
 
-#: src/gtkdialogs.c:286
+#: ../src/gtkdialogs.c:313
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
-#: src/gtkdialogs.c:306
+#: ../src/gtkdialogs.c:333
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#: src/gtkdialogs.c:324
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Informació de l'usuari"
-
-#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-#, fuzzy
-msgid "_Name"
-msgstr "Nom"
-
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: ../src/gtkdialogs.c:488 ../src/gtkdialogs.c:630 ../src/gtkdialogs.c:683
+msgid "_Screen name"
+msgstr "_Nom d'usuari:"
+
+#: ../src/gtkdialogs.c:494 ../src/gtkdialogs.c:636 ../src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "_Compte"
 
-#: src/gtkdialogs.c:499
+#: ../src/gtkdialogs.c:501
 msgid "New Instant Message"
 msgstr "Missatge instantani nou"
 
-#: src/gtkdialogs.c:501
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: ../src/gtkdialogs.c:503
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Entreu el nom d'usuari de la persona a qui vulgueu enviar un missatge "
 "instantani."
 
-#: src/gtkdialogs.c:642
+#: ../src/gtkdialogs.c:643
 msgid "Get User Info"
-msgstr "Obtingues dades de l'usuari"
-
-#: src/gtkdialogs.c:644
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+msgstr "Aconsegueix dades de l'usuari"
+
+#: ../src/gtkdialogs.c:645
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Entreu el nom d'usuari de la persona de la qui vulgueu veure la informació."
 
-#: src/gtkdialogs.c:698
-#, fuzzy
-msgid "View User Log"
-msgstr "Obtingues el registre de l'usuari"
-
-#: src/gtkdialogs.c:700
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+#: ../src/gtkdialogs.c:697
+msgid "Get User Log"
+msgstr "Aconsegueix el registre de l'usuari"
+
+#: ../src/gtkdialogs.c:699
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Entreu el nom d'usuari de la persona de la qui vulgueu veure el registre."
 
-#: src/gtkdialogs.c:719
+#: ../src/gtkdialogs.c:739
+msgid "Warn User"
+msgstr "Avisa l'usuari"
+
+#: ../src/gtkdialogs.c:760
+#, c-format
+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\">Voleu avisar a %s?</span>\n"
+"\n"
+"Això incrementarà el nivell d'avís de %s i estarà subjecte a una limitació "
+"de velocitat més estricta.\n"
+
+#: ../src/gtkdialogs.c:769
+msgid "Warn _anonymously?"
+msgstr "Voleu _avisar anònimament?"
+
+#: ../src/gtkdialogs.c:776
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>Els avisos anònims són menys estrictes.</b>"
+
+#: ../src/gtkdialogs.c:797
 msgid "Alias Contact"
 msgstr "Posa un àlies al contacte"
 
-#: src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:798
 msgid "Enter an alias for this contact."
 msgstr "Introduïu un àlies per a aquest contacte."
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:800 ../src/gtkdialogs.c:822 ../src/gtkdialogs.c:842
+#: ../src/gtkrequest.c:251 ../src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Àlies"
 
-#: src/gtkdialogs.c:740
+#: ../src/gtkdialogs.c:818
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduïu un àlies per a %s."
 
-#: src/gtkdialogs.c:742
+#: ../src/gtkdialogs.c:820
 msgid "Alias Buddy"
 msgstr "Posa un àlies a un amic"
 
-#: src/gtkdialogs.c:761
+#: ../src/gtkdialogs.c:839
 msgid "Alias Chat"
 msgstr "Posa un àlies a un xat"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:840
 msgid "Enter an alias for this chat."
 msgstr "Introduïu un àlies per a aquest xat."
 
-#: src/gtkdialogs.c:799
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: ../src/gtkdialogs.c:874
+#, c-format
+msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
+msgstr ""
 "Ara se suprimirà el contacte que conté %s i %d altres amics de la llista "
 "d'amics. Voleu continuar?"
-msgstr[1] ""
-"Ara se suprimirà el contacte que conté %s i %d altres amics de la llista "
-"d'amics. Voleu continuar?"
-
-#: src/gtkdialogs.c:866
+
+#: ../src/gtkdialogs.c:935
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3304,263 +3389,240 @@
 "Ara se suprimirà el grup %s i tots els seus membres de la llista d'amics. "
 "Voleu continuar?"
 
-#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
+#: ../src/gtkdialogs.c:938 ../src/gtkdialogs.c:939
 msgid "Remove Group"
 msgstr "Suprimeix el grup"
 
-#: src/gtkdialogs.c:908
+#: ../src/gtkdialogs.c:977
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?"
 
-#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
+#: ../src/gtkdialogs.c:980 ../src/gtkdialogs.c:982
 msgid "Remove Buddy"
 msgstr "Suprimeix l'amic"
 
-#: src/gtkdialogs.c:950
+#: ../src/gtkdialogs.c:1019
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Esteu segur que voleu suprimir el xat %s de la llista d'amics?"
 
-#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: ../src/gtkdialogs.c:1022 ../src/gtkdialogs.c:1023
 msgid "Remove Chat"
 msgstr "Suprimeix el Xat"
 
-#: src/gtkft.c:141
+#: ../src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:162 src/gtkft.c:1046
+#: ../src/gtkft.c:162 ../src/gtkft.c:1012
 msgid "Finished"
 msgstr "S'ha finalitzat"
 
-#: src/gtkft.c:165 src/gtkft.c:997
+#: ../src/gtkft.c:165 ../src/gtkft.c:963
 msgid "Canceled"
 msgstr "S'ha cancel·lat"
 
-#: src/gtkft.c:168 src/gtkft.c:916
+#: ../src/gtkft.c:168 ../src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-#: src/gtkft.c:221
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>S'està rebent com a:</b>"
 
-#: src/gtkft.c:223
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>S'està rebent de:</b>"
 
-#: src/gtkft.c:227
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>S'està enviant a:</b>"
 
-#: src/gtkft.c:229
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>S'està enviant com a:</b>"
 
-#: src/gtkft.c:445
+#: ../src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "No hi ha cap aplicació configurada per obrir aquest fitxer."
 
-#: src/gtkft.c:450
+#: ../src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "S'ha produït un error en obrir el fitxer."
 
-#: src/gtkft.c:470
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "S'ha produït un error en executar <b>%s</b>: %s"
-
-#: src/gtkft.c:479
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "Error en llegir %s"
-
-#: src/gtkft.c:480
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:575
+#: ../src/gtkft.c:533
 msgid "Progress"
 msgstr "Progrés"
 
-#: src/gtkft.c:582
+#: ../src/gtkft.c:540
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: src/gtkft.c:589
+#: ../src/gtkft.c:547
 msgid "Size"
 msgstr "Mida"
 
-#: src/gtkft.c:596
+#: ../src/gtkft.c:554
 msgid "Remaining"
 msgstr "Restant"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:586
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: src/gtkft.c:628
-#, fuzzy
+#: ../src/gtkft.c:587
 msgid "Local File:"
-msgstr "Usuaris locals"
-
-#: src/gtkft.c:629
+msgstr "Fitxer local:"
+
+#: ../src/gtkft.c:588
 msgid "Status:"
 msgstr "Estat:"
 
-#: src/gtkft.c:630
+#: ../src/gtkft.c:589
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: src/gtkft.c:631
+#: ../src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "Temps transcorregut:"
 
-#: src/gtkft.c:632
+#: ../src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "Temps restant:"
 
-#: src/gtkft.c:718
+#: ../src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "_Mantingues el quadre de diàleg obert"
 
-#: src/gtkft.c:728
+#: ../src/gtkft.c:693
 msgid "_Clear finished transfers"
 msgstr "_Neteja les transferències acabades"
 
 #. "Download Details" arrow
-#: src/gtkft.c:737
+#: ../src/gtkft.c:702
 msgid "Show transfer details"
 msgstr "Mostra els detalls de la transferència"
 
-#: src/gtkft.c:738
+#: ../src/gtkft.c:703
 msgid "Hide transfer details"
 msgstr "Oculta els detalls de la transferència"
 
 #. Pause button
-#: src/gtkft.c:775 src/gtkstock.c:106
+#: ../src/gtkft.c:745 ../src/stock.c:92
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: src/gtkft.c:785
+#: ../src/gtkft.c:755
 msgid "_Resume"
 msgstr "_Continua"
 
-#: src/gtkft.c:999
+#: ../src/gtkft.c:965
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Mida de l'expansor"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Mida de la fletxa d'expansió"
-
-#: src/gtkimhtml.c:816
+#: ../src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
 msgstr "_Enganxa com a text"
 
-#: src/gtkimhtml.c:1263
+#: ../src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr "Color dels enllaços"
 
-#: src/gtkimhtml.c:1264
+#: ../src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr "El color amb el que pintar els enllaços."
 
-#: src/gtkimhtml.c:1267
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "Color dels enllaços"
-
-#: src/gtkimhtml.c:1268
-#, fuzzy
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "El color amb el que pintar els enllaços."
-
-#: src/gtkimhtml.c:1486
+#: ../src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'adreça de correu"
 
-#: src/gtkimhtml.c:1498
+#: ../src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "_Copia la ubicació de l'enllaç"
+
+#: ../src/gtkimhtml.c:1318
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
-#: src/gtkimhtml.c:1508
-msgid "_Copy Link Location"
-msgstr "_Copia la ubicació de l'enllaç"
-
-#: src/gtkimhtml.c:3182
+#: ../src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3185
+"<span size='larger' weight='bold'>No s'ha pogut reconèixer el tipus de "
+"fitxer</span>\n"
+"\n"
+"Es farà servir PNG per defecte."
+
+#: ../src/gtkimhtml.c:2918
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3198
-#, fuzzy, c-format
+"No s'ha pogut reconèixer el tipus de fitxer\n"
+"\n"
+"Per defecte es farà servir PNG."
+
+#: ../src/gtkimhtml.c:2931
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>\n"
+"<span size='larger' weight='bold'>S'ha produit un error en desar la imatge.</"
+"span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3201
-#, fuzzy, c-format
+#: ../src/gtkimhtml.c:2934
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "S'ha produït un error en desar la imatge: %s"
-
-#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
+msgstr ""
+"S'ha produït un error en desar la imatge\n"
+"\n"
+"%s"
+
+#: ../src/gtkimhtml.c:3014 ../src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "Desa imatge"
 
-#: src/gtkimhtml.c:3321
+#: ../src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "_Desa imatge..."
 
-#: src/gtkimhtmltoolbar.c:141
+#: ../src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Selecciona el tipus de lletra"
 
-#: src/gtkimhtmltoolbar.c:220
+#: ../src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "Selecciona el color del text"
 
-#: src/gtkimhtmltoolbar.c:299
+#: ../src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr "Selecciona el color de fons"
 
-#: src/gtkimhtmltoolbar.c:388
+#: ../src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:396
+#: ../src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Descripció"
 
-#: src/gtkimhtmltoolbar.c:399
+#: ../src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3568,183 +3630,109 @@
 "Introduïu la URL i la descripció de l'enllaç que vulgueu inserir. La "
 "descripció és opcional."
 
-#: src/gtkimhtmltoolbar.c:403
+#: ../src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduïu la URL i la descripció de l'enllaç que vulgueu inserir."
 
-#: src/gtkimhtmltoolbar.c:408
+#: ../src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Insereix enllaç"
 
-#: src/gtkimhtmltoolbar.c:412
+#: ../src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: src/gtkimhtmltoolbar.c:481
+#: ../src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No s'ha pogut emmagatzemar la imatge: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: ../src/gtkimhtmltoolbar.c:531 ../src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "Insereix imatge"
 
-#: src/gtkimhtmltoolbar.c:715
+#: ../src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr "Aquest tema no disposa d'emoticones."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:729
+#: ../src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr "Sonrigueu!"
 
-#: src/gtkimhtmltoolbar.c:917
+#: ../src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "Negreta"
 
-#: src/gtkimhtmltoolbar.c:928
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "Itàlica"
 
-#: src/gtkimhtmltoolbar.c:939
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "Subratllat"
 
-#: src/gtkimhtmltoolbar.c:955
+#: ../src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "Tipus de lletra més gran"
 
-#: src/gtkimhtmltoolbar.c:967
+#: ../src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "Tipus de lletra més petita"
 
-#: src/gtkimhtmltoolbar.c:984
+#: ../src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-#: src/gtkimhtmltoolbar.c:996
+#: ../src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "Color del text"
 
-#: src/gtkimhtmltoolbar.c:1008
+#: ../src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "Color de fons"
 
-#: src/gtkimhtmltoolbar.c:1024
-#, fuzzy
-msgid "Clear formatting"
-msgstr "_Neteja la formatació"
-
-#: src/gtkimhtmltoolbar.c:1039
+#: ../src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "Insereix un enllaç"
 
-#: src/gtkimhtmltoolbar.c:1049
+#: ../src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr "Insereix una imatge"
 
-#: src/gtkimhtmltoolbar.c:1060
+#: ../src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr "Insereix una emoticona"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Converses amb %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Converses amb %s"
-
-#: src/gtklog.c:397
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
-msgstr ""
-
-#: src/gtklog.c:401
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:404
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-
-#: src/gtklog.c:409
-msgid "No logs were found."
-msgstr ""
-
-#: src/gtklog.c:455
-#, fuzzy, c-format
-msgid "Conversations in %s"
-msgstr "Converses amb %s"
-
-#: src/gtklog.c:463 src/gtklog.c:513
+#: ../src/gtklog.c:316
 #, c-format
 msgid "Conversations with %s"
 msgstr "Converses amb %s"
 
-#: src/gtklog.c:538
+#. Window **********
+#: ../src/gtklog.c:412 ../src/gtklog.c:429
 msgid "System Log"
 msgstr "Registre del sistema"
 
-#: src/gtkmain.c:323
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Proveu '%s -h' per a més informació.\n"
-
-#: src/gtkmain.c:325
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Forma d'ús: %s [OPTCIÓ]...\n"
-"\n"
-"  -a, --acct          mostra la finestra d'edició de comptes\n"
-"  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
-"  -d, --debug         mostra missatges de depuració a la sortida estàndard\n"
-"  -h, --help          mostra aquesta ajuda i surt\n"
-"  -n, --nologin       no entra automàticament\n"
-"  -l, --login[=NOM]   entra automàticament (l'argument opcional NOM indica "
-"els\n"
-"                      comptes a fer servir, separats per comes)\n"
-"  -v, --version       mostra la versió actual i surt\n"
-
 #. Descriptive label
-#: src/gtknotify.c:267
+#: ../src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s té %d missatge nou."
 msgstr[1] "%s té %d missatges nous."
 
-#: src/gtknotify.c:281
+#: ../src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: ../src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Tema:</span> %s\n"
 
-#: src/gtknotify.c:295
+#: ../src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3755,7 +3743,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:311
+#: ../src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3766,186 +3754,190 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:456
-msgid "Search Results"
-msgstr "Resultats de la cerca"
-
-#: src/gtknotify.c:617
+#: ../src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "L'ordre <b>%s</b> per al navegador no és vàlida."
 
-#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
-#: src/gtknotify.c:768
+#: ../src/gtknotify.c:432 ../src/gtknotify.c:444 ../src/gtknotify.c:457
+#: ../src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "No s'ha pogut obrir la URL"
 
-#: src/gtknotify.c:629 src/gtknotify.c:642
+#: ../src/gtknotify.c:442 ../src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "S'ha produït un error en executar <b>%s</b>: %s"
 
-#: src/gtknotify.c:769
+#: ../src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "S'ha escollit l'ordre per al navegador 'manualment', però no se n'ha indicat "
 "cap."
 
-#: src/gtkpounce.c:130
+#: ../src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Introduïu un amic a qui avisar."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:391 ../src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr "Avís nou per a l'amic"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avís per a l'amic"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
+#: ../src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr "Avisa a"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:435
 msgid "_Buddy name:"
 msgstr "Nom de l'_amic:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
+#: ../src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr "Avisa quan"
 
-#: src/gtkpounce.c:467
+#: ../src/gtkpounce.c:467
 msgid "Si_gn on"
 msgstr "_Connecta"
 
-#: src/gtkpounce.c:469
+#: ../src/gtkpounce.c:469
 msgid "Sign _off"
 msgstr "_Desconnecta"
 
-#: src/gtkpounce.c:471
+#: ../src/gtkpounce.c:471
 msgid "A_way"
 msgstr "_Absent"
 
-#: src/gtkpounce.c:473
+#: ../src/gtkpounce.c:473
 msgid "_Return from away"
 msgstr "To_rna a estar present"
 
-#: src/gtkpounce.c:475
+#: ../src/gtkpounce.c:475
 msgid "_Idle"
 msgstr "_Inactiu"
 
-#: src/gtkpounce.c:477
+#: ../src/gtkpounce.c:477
 msgid "Retur_n from idle"
 msgstr "Tor_na a estar actiu"
 
-#: src/gtkpounce.c:479
+#: ../src/gtkpounce.c:479
 msgid "Buddy starts _typing"
 msgstr "L'a_mic comença a escriure"
 
-#: src/gtkpounce.c:481
+#: ../src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
 msgstr "L'a_mic para d'escriure"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
+#: ../src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr "Acció a emprendre"
 
-#: src/gtkpounce.c:518
+#: ../src/gtkpounce.c:518
 msgid "Op_en an IM window"
 msgstr "Obre una finestra de MI"
 
-#: src/gtkpounce.c:520
+#: ../src/gtkpounce.c:520
 msgid "_Popup notification"
 msgstr "_Notificació emergent"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:522
 msgid "Send a _message"
 msgstr "Envia un _missatge"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr "E_xecuta una ordre"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:526
 msgid "P_lay a sound"
 msgstr "Reproduei_x un so"
 
-#: src/gtkpounce.c:530
+#: ../src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr "Na_vega..."
 
-#: src/gtkpounce.c:532
+#: ../src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr "Na_vega..."
 
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr "Pre_visualitza"
 
-#: src/gtkpounce.c:616
+#: ../src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr "_Desa aquest avís després de l'activació"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: ../src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr "Suprimeix l'avís d'un amic"
 
-#: src/gtkpounce.c:964
+#: ../src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s us ha començat a escriure (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s'ha connectat (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ha deixat d'estar inactiu (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha deixat d'estar absent (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha deixat d'escriure-us (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s'ha desconnectat (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ha passat a inactiu (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ha passat a absent (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
-#: src/gtkprefs.c:685
+#: ../src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "Opcions de la interfície"
+
+#: ../src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "Mostra els sobrenoms remots s_i no se'ls ha establert cap àlies"
+
+#: ../src/gtkprefs.c:681
 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."
@@ -3953,57 +3945,49 @@
 "Seleccioneu un tema d'emoticones de la llista següent. Es poden instal·lar "
 "temes nous arrosegant-los i deixant-los anar a la llista de temes."
 
-#: src/gtkprefs.c:725
+#: ../src/gtkprefs.c:721
 msgid "Icon"
 msgstr "Icona"
 
-#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:728 ../src/gtkprefs.c:2205
+#: ../src/protocols/jabber/buddy.c:264 ../src/protocols/jabber/buddy.c:757
+#: ../src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "Descripció"
 
-#: src/gtkprefs.c:832
-msgid "Buddy List Sorting"
-msgstr "Ordenació de la llista d'amics"
-
-#: src/gtkprefs.c:841
-msgid "_Sorting:"
-msgstr "_Ordenació:"
-
-#: src/gtkprefs.c:846
-msgid "Buddy Display"
-msgstr "Visualització d'amics"
-
-#: src/gtkprefs.c:847
-msgid "Show more buddy details"
-msgstr "Mostra mésdetalls de l'amic"
-
-#: src/gtkprefs.c:885
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Envia les ordre_s \"barra inversa\" desconegudes com a missatges"
-
-#: src/gtkprefs.c:887
-#, fuzzy
-msgid "Show _formatting on incoming messages"
-msgstr "Mostra la barra d'eines per a la _formatació"
-
-#: src/gtkprefs.c:889
-msgid "Show buddy _icons"
-msgstr "Mostra les _icones dels amics"
-
-#: src/gtkprefs.c:891
-msgid "Enable buddy ic_on animation"
-msgstr "Habilita l'_animació de les icones dels amics"
-
-#: src/gtkprefs.c:893
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Notifica als amics quan els escrigui"
-
-#: src/gtkprefs.c:896
+#: ../src/gtkprefs.c:824
+msgid "Display"
+msgstr "Visualitza"
+
+#: ../src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "Mos_tra marques horàries en els missatges"
+
+#: ../src/gtkprefs.c:828
 msgid "_Highlight misspelled words"
 msgstr "_Ressalta paraules mal escrites"
 
-#: src/gtkprefs.c:914
+#: ../src/gtkprefs.c:832
+msgid "Ignore c_olors"
+msgstr "Ignora _colors"
+
+#: ../src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "Ignora _tipus de lletra"
+
+#: ../src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Ignora la _mida de la lletra"
+
+#: ../src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr "Formatació per defecte"
+
+#: ../src/gtkprefs.c:841
+msgid "_Send default formatting with outgoing messages"
+msgstr "_Envia la formatació per defecte per als missatges sortints"
+
+#: ../src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4011,151 +3995,273 @@
 "Així és com els missatges de text sortints apareixeran quan feu servir "
 "protocols que impementin la formatació. :)"
 
+#: ../src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "_Neteja la formatació"
+
+#: ../src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Enviament dels missatges"
+
+#: ../src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "La tecla de _retorn envia el missatge"
+
+#: ../src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "La c_ombinació de tecles control-retorn envia el missatge"
+
+#: ../src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "Tancament de les finestres"
+
+#: ../src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "La tecla d'_escapament tanca la finestra"
+
+#: ../src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "Insercions"
+
+#: ../src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U/S} canvia la _formatació"
+
+#: ../src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(nombre) _insereix emoticones"
+
+#: ../src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "Ordenació de la llista d'amics"
+
+#: ../src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "_Ordenació:"
+
+#: ../src/gtkprefs.c:957 ../src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "Mostra els _botons com a:"
+
+#: ../src/gtkprefs.c:959 ../src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Imatges"
+
+#: ../src/gtkprefs.c:960 ../src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Text"
+
+#: ../src/gtkprefs.c:961 ../src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Imatges i text"
+
+#: ../src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "_Alça les finestres en rebre-hi esdeveniments"
+
+#: ../src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "Visualització d'amics"
+
+#: ../src/gtkprefs.c:968 ../src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "Mostra les _icones dels amics"
+
+#: ../src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "Mostra nivells d'_avís"
+
+#: ../src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "Mostra _temps inactiu"
+
+#: ../src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "Enfosqueix els amics inactius"
+
+#: ../src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "Expandeix _automàticament els contactes"
+
+#: ../src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "Habilita les ordre_s \"barra inversa\""
+
+#: ../src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Envia les ordre_s \"barra inversa\" desconegudes com a missatges"
+
+#: ../src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "Mostra la barra d'eines per a la _formatació"
+
+#: ../src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "Mostr_a els àlies a les pestanyes/títols"
+
+#: ../src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "Habilita l'_animació de les icones dels amics"
+
+#: ../src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Notifica als amics quan els escrigui"
+
+#: ../src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "Alça les finestres de MI en _rebre-hi esdeveniments"
+
+#: ../src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "Alça les finestres de _xat en rebre-hi esdeveniments"
+
+#: ../src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "Fes servir àlies _multicolors en els xats"
+
 #. All the tab options!
-#: src/gtkprefs.c:935
+#: ../src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr "Opcions de les pestanyes"
 
-#: src/gtkprefs.c:937
+#: ../src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra MI i xats en finestres amb _pestanyes"
 
-#: src/gtkprefs.c:951
+#: ../src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr "Mosta el b_otó de tancar a les pestanyes"
 
-#: src/gtkprefs.c:957
-#, fuzzy
-msgid "_Placement:"
-msgstr "Ubicació extra"
-
-#: src/gtkprefs.c:959
+#: ../src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "Situació de _les pestanyes:"
+
+#: ../src/gtkprefs.c:1067
 msgid "Top"
 msgstr "A dalt"
 
-#: src/gtkprefs.c:960
+#: ../src/gtkprefs.c:1068
 msgid "Bottom"
 msgstr "A baix"
 
-#: src/gtkprefs.c:961
+#: ../src/gtkprefs.c:1069
 msgid "Left"
 msgstr "A la dreta"
 
-#: src/gtkprefs.c:962
+#: ../src/gtkprefs.c:1070
 msgid "Right"
 msgstr "A l'esquerra"
 
-#: src/gtkprefs.c:966
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "Tanca la conversa"
-
-#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
-#: src/protocols/oscar/oscar.c:5310
+#: ../src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "_Posicionament d'una nova conversa:"
+
+#: ../src/gtkprefs.c:1127 ../src/protocols/oscar/oscar.c:749
+#: ../src/protocols/oscar/oscar.c:5199
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: src/gtkprefs.c:1019
+#: ../src/gtkprefs.c:1129
 msgid "_Autodetect IP Address"
 msgstr "_Autodetecta l'adreça IP"
 
-#: src/gtkprefs.c:1028
+#: ../src/gtkprefs.c:1138
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: src/gtkprefs.c:1052
+#: ../src/gtkprefs.c:1162
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1055
+#: ../src/gtkprefs.c:1165
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especifica _manualment el rang de ports on escoltar"
 
-#: src/gtkprefs.c:1058
+#: ../src/gtkprefs.c:1168
 msgid "_Start Port:"
 msgstr "Port _inicial:"
 
-#: src/gtkprefs.c:1065
+#: ../src/gtkprefs.c:1175
 msgid "_End Port:"
 msgstr "Port _final:"
 
-#: src/gtkprefs.c:1072
+#: ../src/gtkprefs.c:1182
 msgid "Proxy Server"
 msgstr "Servidor intermediari"
 
-#: src/gtkprefs.c:1076
+#: ../src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "Sense servidor intermediari"
 
-#: src/gtkprefs.c:1138
+#: ../src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "_Usuari:"
 
-#: src/gtkprefs.c:1194
+#: ../src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1195
+#: ../src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1196
+#: ../src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1197
+#: ../src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1198
+#: ../src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "Predeterminat del Gnome"
 
-#: src/gtkprefs.c:1199
+#: ../src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1200
+#: ../src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1202
+#: ../src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1211
+#: ../src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1264
+#: ../src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1275
+#: ../src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "_Obre la ubicació de l'enllaç a:"
 
-#: src/gtkprefs.c:1277
+#: ../src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "Predeterminat del navegador"
 
-#: src/gtkprefs.c:1278
+#: ../src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "Finestra existent"
 
-#: src/gtkprefs.c:1280
+#: ../src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "Nova pestanya"
 
-#: src/gtkprefs.c:1294
+#: ../src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4164,77 +4270,83 @@
 "_Manual:\n"
 "(%s per a l'URL)"
 
-#: src/gtkprefs.c:1333
+#: ../src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr "Registres de missatges"
 
-#: src/gtkprefs.c:1336
+#: ../src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "_Format del registre:"
 
-#: src/gtkprefs.c:1339
+#: ../src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr "_Registra tots els missatges instantanis"
 
-#: src/gtkprefs.c:1341
+#: ../src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "Registra tots els _xats"
 
-#: src/gtkprefs.c:1344
+#: ../src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr "Registres del sistema"
 
-#: src/gtkprefs.c:1346
+#: ../src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr "Habilita el r_egistre del sistema"
 
-#: src/gtkprefs.c:1349
-#, fuzzy
-msgid "Log when buddies log in/log _out"
+#: ../src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
 msgstr "Regi_stra quan els amics es connecten/desconnecten"
 
-#: src/gtkprefs.c:1355
+#: ../src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registra quan els amics passen a _inactiu/actiu"
 
-#: src/gtkprefs.c:1361
+#: ../src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr "Registra quan els amics passen a a_bsent/tornen"
 
-#: src/gtkprefs.c:1367
-#, fuzzy
-msgid "Log your own _signons/idleness/awayness"
+#: ../src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Registra la pròpia c_onnexió/inactivitat/absència"
 
-#: src/gtkprefs.c:1504
+#: ../src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr "Selecció de sons"
 
-#: src/gtkprefs.c:1558
+#: ../src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "Opcions de so"
+
+#: ../src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "Sons quan la conversa tingui el _focus"
+
+#: ../src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "_Sons mentre s'està absent"
+
+#: ../src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr "Mètodes de reproducció del so"
 
-#: src/gtkprefs.c:1559
+#: ../src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr "_Mètode:"
 
-#: src/gtkprefs.c:1561
+#: ../src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr "Avís sonor del terminal"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/gtkprefs.c:1568
+#: ../src/gtkprefs.c:1670
 msgid "Command"
 msgstr "Ordre"
 
-#: src/gtkprefs.c:1569
-msgid "No sounds"
-msgstr "Sense sons"
-
-#: src/gtkprefs.c:1577
+#: ../src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4243,99 +4355,90 @@
 "Ordre per al so\n"
 "(%s per al nom de fitxer)"
 
-#: src/gtkprefs.c:1604
-msgid "Sound Options"
-msgstr "Opcions de so"
-
-#: src/gtkprefs.c:1605
-msgid "Sounds when conversation has _focus"
-msgstr "Sons quan la conversa tingui el _focus"
-
-#: src/gtkprefs.c:1607
-msgid "_Sounds while away"
-msgstr "_Sons mentre s'està absent"
-
-#: src/gtkprefs.c:1617
+#: ../src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr "Esdeveniments de so"
 
-#: src/gtkprefs.c:1668
+#: ../src/gtkprefs.c:1756
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/gtkprefs.c:1675
+#: ../src/gtkprefs.c:1763
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/gtkprefs.c:1694
+#: ../src/gtkprefs.c:1782
 msgid "Test"
 msgstr "Prova"
 
-#: src/gtkprefs.c:1698
+#: ../src/gtkprefs.c:1786
 msgid "Reset"
 msgstr "Reinicia"
 
-#: src/gtkprefs.c:1702
+#: ../src/gtkprefs.c:1790
 msgid "Choose..."
 msgstr "Escull..."
 
-#: src/gtkprefs.c:1758
+#: ../src/gtkprefs.c:1814
 msgid "_Queue new messages when away"
 msgstr "Posa els missatges en una cua _quan estigui absent"
 
-#: src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "Resposta _automàtica:"
 
-#: src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:1819
+msgid "Never"
+msgstr "Mai"
+
+#: ../src/gtkprefs.c:1820
 msgid "When away"
 msgstr "En estar absent"
 
-#: src/gtkprefs.c:1765
-#, fuzzy
-msgid "When both away and idle"
+#: ../src/gtkprefs.c:1821
+msgid "When away and idle"
 msgstr "En estar absent i inactiu"
 
-#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
-#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: ../src/gtkprefs.c:1824 ../src/protocols/msn/msn.c:1327
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2806
+#: ../src/protocols/oscar/oscar.c:4347 ../src/protocols/yahoo/yahoo.c:2780
+#: ../src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inactiu"
 
-#: src/gtkprefs.c:1769
+#: ../src/gtkprefs.c:1825
 msgid "Idle _time reporting:"
 msgstr "Informe del _temps inactiu:"
 
-#: src/gtkprefs.c:1772
+#: ../src/gtkprefs.c:1828
 msgid "Gaim usage"
 msgstr "Ús del Gaim"
 
-#: src/gtkprefs.c:1775
+#: ../src/gtkprefs.c:1831
 msgid "X usage"
 msgstr "Ús de les X"
 
-#: src/gtkprefs.c:1777
+#: ../src/gtkprefs.c:1833
 msgid "Windows usage"
 msgstr "Ús del Windows"
 
-#: src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1841
 msgid "Auto-away"
 msgstr "Auto-absència"
 
-#: src/gtkprefs.c:1786
+#: ../src/gtkprefs.c:1842
 msgid "Set away _when idle"
 msgstr "Passa a a_bsent quan estigui inactiu"
 
-#: src/gtkprefs.c:1790
+#: ../src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr "_Minuts abans de passar a absent:"
 
-#: src/gtkprefs.c:1798
+#: ../src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr "Missatge d'absència:"
 
-#: src/gtkprefs.c:1856
+#: ../src/gtkprefs.c:1923
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4350,7 +4453,7 @@
 "<span weight=\"bold\">Pàgina web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>\t%s"
 
-#: src/gtkprefs.c:1861
+#: ../src/gtkprefs.c:1928
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4365,127 +4468,143 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>  %s"
 
-#: src/gtkprefs.c:1996
+#: ../src/gtkprefs.c:2161
 msgid "Load"
 msgstr "Carrega"
 
-#: src/gtkprefs.c:2010
+#: ../src/gtkprefs.c:2175
 msgid "Summary"
 msgstr "Sumari"
 
-#: src/gtkprefs.c:2058
+#: ../src/gtkprefs.c:2223
 msgid "Details"
 msgstr "Detalls"
 
-#: src/gtkprefs.c:2101
+#: ../src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "Interfície"
+
+#: ../src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "Text del missatge"
+
+#: ../src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "Dreceres"
+
+#: ../src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr "Temes d'emoticones"
 
-#: src/gtkprefs.c:2102
+#: ../src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
+#: ../src/gtkprefs.c:2427 ../src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr "Xarxa"
 
-#: src/gtkprefs.c:2108
+#: ../src/gtkprefs.c:2432
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2111
+#: ../src/gtkprefs.c:2435
 msgid "Logging"
 msgstr "Registre"
 
-#: src/gtkprefs.c:2112
+#: ../src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr "Absent/Inactiu"
 
-#: src/gtkprefs.c:2115
+#: ../src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "Missatges d'absència"
+
+#: ../src/gtkprefs.c:2440
 msgid "Plugins"
 msgstr "Connectors"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permet a tots els usuaris contactar amb mi"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Només permet els usuaris de la llista d'amics"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Només permet els usuaris indicats aquí baix"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloca tots els usuaris"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloca els usuaris indicats aquí baix"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:397 ../src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Els canvis en les opcions de privadesa es realitzen immediatament."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr "Estableix la privadesa de:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:591 ../src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr "Permet l'usuari"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr "Escriviu quin usuari permeteu que us contacti."
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Introduïu el nom de l'usuari que vulgueu que us pugui contactar."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: ../src/gtkprivacy.c:596 ../src/gtkprivacy.c:609
 msgid "Permit"
 msgstr "Permet"
 
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:601
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Voleu permetre que %s us pugui contactar?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:603
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Esteu segur que voleu permetre que %s us pugui contactar?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:630 ../src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "Bloca un usuari"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr "Escriviu l'usuari que vulgueu blocar."
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:632
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduïu el nom de l'usuari que vulgueu blocar."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
-msgid "Block"
-msgstr "Bloca"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Esteu segur que voleu blocar %s?"
@@ -4493,164 +4612,103 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
-#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1257
+#: ../src/gtkrequest.c:241 ../src/protocols/gg/gg.c:951
+#: ../src/protocols/msn/dialog.c:113 ../src/protocols/msn/msn.c:499
+#: ../src/protocols/msn/msn.c:502 ../src/protocols/novell/novell.c:1892
+#: ../src/protocols/silc/buddy.c:307 ../src/protocols/silc/pk.c:117
+#: ../src/request.h:1236
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
-#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1257
+#: ../src/gtkrequest.c:242 ../src/protocols/gg/gg.c:951
+#: ../src/protocols/msn/dialog.c:114 ../src/protocols/msn/msn.c:499
+#: ../src/protocols/msn/msn.c:502 ../src/protocols/novell/novell.c:1893
+#: ../src/protocols/silc/buddy.c:308 ../src/protocols/silc/pk.c:118
+#: ../src/request.h:1236
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:262
+#: ../src/gtkrequest.c:245
 msgid "Apply"
 msgstr "Aplica"
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:246 ../src/protocols/msn/msn.c:314
+#: ../src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Tanca"
 
-#: src/gtkrequest.c:1764
+#: ../src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "Aquest fitxer ja existeix"
 
-#: src/gtkrequest.c:1765
+#: ../src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "Voleu sobrescriurer-lo?"
 
-#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
+#: ../src/gtkrequest.c:1460 ../src/gtkrequest.c:1481
 msgid "Save File..."
 msgstr "Desa fitxer..."
 
-#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
+#: ../src/gtkrequest.c:1461 ../src/gtkrequest.c:1482
 msgid "Open File..."
 msgstr "Obre fitxer..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "Llista de sales"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:402
 msgid "_Get List"
-msgstr "_Obtingues la llista"
-
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Títol"
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr "Tipus"
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
-#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
-#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
-#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
-#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
-#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr "Missatge"
-
-#: src/gtksavedstatuses.c:399
-msgid "Saved Statuses"
-msgstr "Estats desats"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Ja s'utilitza aquest títol. Heu d'escollir un títol únic."
-
-#: src/gtksavedstatuses.c:611
-msgid "Custom status"
-msgstr "Estat personalitzat"
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
-#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
-#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
-msgid "Status"
-msgstr "Estat"
-
-#: src/gtksavedstatuses.c:733
-msgid "_Title:"
-msgstr "_Títol:"
-
-#: src/gtksavedstatuses.c:744
-msgid "Out of the office"
-msgstr "Fora de l'oficina"
-
-#: src/gtksavedstatuses.c:755
-msgid "_Status:"
-msgstr "E_stat:"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr "Utilitza un estat diferent per a determinats comptes"
-
-#: src/gtksound.c:60
+msgstr "_Aconsegueix la llista"
+
+#: ../src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "L'amic es connecta"
 
-#: src/gtksound.c:61
+#: ../src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "L'amic es desconnecta"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:65
 msgid "Message received"
 msgstr "Es rep un missatge"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "El missatge rebut inicia una conversa"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:67
 msgid "Message sent"
 msgstr "S'envia un missatge"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Una persona entra al xat"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Una persona surt del xat"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Parleu en un xat"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Altres parlen en un xat"
 
-#: src/gtksound.c:71
+#: ../src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Algú diu el vostre nom en un xat"
 
-#: src/gtksound.c:257
+#: ../src/gtksound.c:173
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 "No s'ha pogut reproduir el so perquè el fitxer seleccionat (%s) no existeix."
 
-#: src/gtksound.c:273
+#: ../src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4658,7 +4716,7 @@
 "No s'ha pogut reproduir el so perquè s'ha escollit 'ordre' per reproduir el "
 "so, però no se n'ha indicat cap."
 
-#: src/gtksound.c:285
+#: ../src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4667,167 +4725,16 @@
 "No s'ha pogut reproduir el so perquè no es pot executar l'ordre de so "
 "configurada: %s"
 
-#: src/gtkstatusbox.c:132
-msgid "Typing"
-msgstr "Teclejant"
-
-#. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
-#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
-#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "S'està connectant"
-
-#. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
-#: 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:2810 src/protocols/novell/novell.c:2948
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
-msgid "Available"
-msgstr "Disponible"
-
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
-msgid "Offline"
-msgstr "Fora de línia"
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-msgid "New Status"
-msgstr "Estat nou"
-
-#: src/gtkstock.c:101
-msgid "_Alias"
-msgstr "À_lies"
-
-#: src/gtkstock.c:103
-msgid "_Invite"
-msgstr "Conv_ida"
-
-#: src/gtkstock.c:104
-msgid "_Modify"
-msgstr "_Modifica"
-
-#: src/gtkstock.c:105
-msgid "_Open Mail"
-msgstr "_Obre el correu"
-
-#: src/gtkstock.c:107
-msgid "_Warn"
-msgstr "_Avisa"
-
-#: src/gtkutils.c:1386 src/gtkutils.c:1411
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "S'ha produït el següent error en carregar %s: %s"
-
-#: src/gtkutils.c:1388 src/gtkutils.c:1413
-msgid "Failed to load image"
-msgstr "No s'ha pogut carregar la imatge"
-
-#: src/gtkutils.c:1488
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "No s'ha pogut enviar la carpeta %s."
-
-#: src/gtkutils.c:1490
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"El Gaim no pot transferir una carpeta. Haureu d'enviar per separat cada un "
-"dels fitxers"
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
-msgid "You have dragged an image"
-msgstr "Heu arrossegat una imatge"
-
-#: src/gtkutils.c:1519
-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 ""
-"Podeu enviar aquesta imatge com una transferència de fitxer, incrustar-la en "
-"el missatge, o usar-la com a icona d'amic per a aquest usuari."
-
-#: src/gtkutils.c:1523 src/gtkutils.c:1538
-msgid "Set as buddy icon"
-msgstr "Estableix com a icona de l'amic"
-
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
-msgid "Send image file"
-msgstr "Envia unfitxer d'imatge"
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1539
-msgid "Insert in message"
-msgstr "Insereix un el missatge"
-
-#: src/gtkutils.c:1528
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Voleu establir-la com la icona per a aquest amic?"
-
-#: src/gtkutils.c:1533
-#, fuzzy
-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 ""
-"Podeu enviar aquesta imatge com a una transferència de fitxer, incrustar-la "
-"en el missatge o utilitzar-la com a icona per a aquest usuari."
-
-#: src/gtkutils.c:1535
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Podeu incrustar aquesta imatge en el missatge o utilitzar-la com a icona per "
-"a aquest usuari."
-
-#. 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:1589
-msgid "Cannot send launcher"
-msgstr "No es pot enviar el llançador"
-
-#: src/gtkutils.c:1589
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò al "
-"que aquest llançador apunta i no pas el llançador."
-
-#: src/log.c:105
+#: ../src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registrador no té cap funció de lectura</font></b>"
 
-#: src/log.c:746
+#: ../src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:811
+#: ../src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4836,7 +4743,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:813
+#: ../src/log.c:612
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4845,30 +4752,117 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:864 src/log.c:995
+#: ../src/log.c:663 ../src/log.c:793
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>No s'ha pogut trobar la ruta del registre.</b></font>"
 
-#: src/log.c:874 src/log.c:1007
+#: ../src/log.c:673 ../src/log.c:805
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 
-#: src/log.c:878
+#: ../src/log.c:677
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:940
+#: ../src/log.c:738
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: src/log.c:1011
+#: ../src/log.c:809
 msgid "Plain text"
 msgstr "Text"
 
-#: src/plugin.c:324
+#: ../src/main.c:150
+msgid "Please create an account."
+msgstr "Creeu un compte."
+
+#: ../src/main.c:232
+msgid "Login"
+msgstr "Nom d'usuari"
+
+#: ../src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>_Compte:</b>"
+
+#: ../src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>C_ontrasenya:</b>"
+
+#. And now for the buttons
+#: ../src/main.c:279
+msgid "A_ccounts"
+msgstr "_Comptes"
+
+#: ../src/main.c:285
+msgid "P_references"
+msgstr "P_referències"
+
+#: ../src/main.c:291
+msgid "_Sign on"
+msgstr "Co_nnecta"
+
+#. full help text
+#: ../src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Ús: %s [OPCIÓ]...\n"
+"\n"
+"  -a, --acct             mostra la finestra d'edició de comptes\n"
+"  -w, --away[=MISSATGE]  entra com a absent quan es connecta\n"
+"                         (l'argument opcional MISSATGE especifica el "
+"missatge\n"
+"                         d'absència a mostrar)\n"
+"  -l, --login[=NOM]      connexió automàtica (l'argument opcional NOM\n"
+"                         especifica els comptes a usar, separats per comes)\n"
+"  -n, --loginwin         no es connecta automàticament; mostra la finestra\n"
+"                         de connexió\n"
+"  -u, --user=NOM         usa el compte NOM\n"
+"  -c, --config=DIR       utilitza DIR per a fitxers de configuració\n"
+"  -d, --debug            escriu els missatges de depuració a la sortida\n"
+"                         estàndard\n"
+"  -v, --version          mostra la versió i surt\n"
+"  -h, --help             mostra aquesta ajuda i surt\n"
+
+#. short message
+#: ../src/main.c:528
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Proveu '%s -h' per a més informació.\n"
+
+#: ../src/main.c:895
+msgid "Unable to load preferences"
+msgstr "No s'han pogut carregar les preferències"
+
+#: ../src/main.c:895
+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 ""
+"El Gaim no ha pogut carregar les vostres preferències perquè estan desades "
+"en un format antic que ja no es fa servir. Reconfigureu els vostres "
+"paràmetres en la finestra de preferències."
+
+#: ../src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4877,127 +4871,126 @@
 "No s'ha pogut trobar el connector requerit %s. Instal·leu aquest connector i "
 "intenteu-ho de nou."
 
-#: src/plugin.c:329 src/plugin.c:357
+#: ../src/plugin.c:300 ../src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr "El Gaim no ha pogut carregar el connector."
 
-#: src/plugin.c:353
+#: ../src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No s'ha pogut carregar el connector requerit %s."
 
-#: src/prefs.c:1094
+#: ../src/prefs.c:113 ../src/status.c:273
 msgid "Slightly less boring default"
 msgstr "Opció per defecte lleugerament menys avorrida"
 
-#: src/protocols/gg/gg.c:51
+#: ../src/protocols/gg/gg.c:50 ../src/protocols/jabber/jutil.c:44
+#: ../src/protocols/msn/msn.c:513 ../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:2797
+#: ../src/protocols/novell/novell.c:2916 ../src/protocols/novell/novell.c:2967
+#: ../src/protocols/oscar/oscar.c:771 ../src/protocols/yahoo/yahoo.c:3125
+#: ../src/protocols/yahoo/yahoo.c:3241
+msgid "Available"
+msgstr "Disponible"
+
+#: ../src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Només disponible per als amics"
 
-#: src/protocols/gg/gg.c:53
+#: ../src/protocols/gg/gg.c:53
 msgid "Away for friends only"
 msgstr "Només absent per als amics"
 
-#: src/protocols/gg/gg.c:55
+#: ../src/protocols/gg/gg.c:54 ../src/protocols/jabber/jabber.c:1002
+#: ../src/protocols/jabber/presence.c:139 ../src/protocols/oscar/oscar.c:689
+#: ../src/protocols/oscar/oscar.c:5715 ../src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:5817 ../src/protocols/oscar/oscar.c:7004
+#: ../src/protocols/oscar/oscar.c:7009 ../src/protocols/yahoo/yahoo.c:2778
+#: ../src/protocols/yahoo/yahoo.c:3145 ../src/protocols/yahoo/yahoo.c:3253
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Només invisible per als amics"
 
-#: src/protocols/gg/gg.c:56 src/status.c:157
+#: ../src/protocols/gg/gg.c:56
 msgid "Unavailable"
-msgstr "No disponbible"
-
-#: src/protocols/gg/gg.c:151
+msgstr "No disponible"
+
+#: ../src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "No s'ha pogut resoldre el nom de l'ordinador."
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: ../src/protocols/gg/gg.c:140 ../src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: src/protocols/gg/gg.c:157 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:109
+#: ../src/protocols/gg/gg.c:143 ../src/protocols/jabber/auth.c:134
+#: ../src/protocols/jabber/auth.c:208 ../src/protocols/jabber/auth.c:369
+#: ../src/protocols/jabber/auth.c:467 ../src/protocols/jabber/auth.c:479
+#: ../src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "La resposta del servidor no és vàlida."
 
-#: src/protocols/gg/gg.c:160
+#: ../src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "S'ha produït un error en llegir del sòcol."
 
-#: src/protocols/gg/gg.c:163
+#: ../src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "S'ha produït un error en escriure al sòcol."
 
-#: src/protocols/gg/gg.c:166
+#: ../src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: src/protocols/gg/gg.c:169
+#: ../src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "Codi d'error desconegut."
 
-#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
+#: ../src/protocols/gg/gg.c:243 ../src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estat:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
-#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: ../src/protocols/gg/gg.c:244 ../src/protocols/gg/gg.c:1013
+#: ../src/protocols/napster/napster.c:404 ../src/protocols/oscar/oscar.c:4152
+#: ../src/protocols/oscar/oscar.c:4376 ../src/protocols/silc/ops.c:1086
+#: ../src/protocols/silc/ops.c:1148 ../src/protocols/toc/toc.c:468
+#: ../src/protocols/zephyr/zephyr.c:726 ../src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "Informació sobre l'amic"
 
-#. TODO: Do we need both an "online" and an "available" state?
-#. 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:310 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
-#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
-#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
-msgid "Online"
-msgstr "En línia"
-
-#: src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: src/protocols/gg/gg.c:519
+#: ../src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr "No s'ha pogut connectar"
 
-#: src/protocols/gg/gg.c:526
+#: ../src/protocols/gg/gg.c:454
 msgid "Unable to read socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
-#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
+#: ../src/protocols/gg/gg.c:674 ../src/protocols/icq/gaim_icq.c:343
+#: ../src/protocols/napster/napster.c:486
+#: ../src/protocols/napster/napster.c:517 ../src/protocols/toc/toc.c:170
+#: ../src/protocols/yahoo/yahoo.c:2407 ../src/protocols/yahoo/yahoo.c:2436
+#: ../src/protocols/yahoo/yahoo.c:2499
+#: ../src/protocols/yahoo/yahoo_filexfer.c:68
+#: ../src/protocols/yahoo/yahoo_filexfer.c:111
+#: ../src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "No s'ha pogut connectar."
 
-#: src/protocols/gg/gg.c:834
+#: ../src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "S'estan llegint dades"
 
@@ -5011,137 +5004,137 @@
 # indicating that gaim is doing "handshaking" with the "balancer"
 # server.
 # -- by Ambrose Li on a mail to the gaim-i18n list (josep)
-#: src/protocols/gg/gg.c:837
+#: ../src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
-msgstr "S'stà negociant amb el distribuïdor"
-
-#: src/protocols/gg/gg.c:840
+msgstr "S'està negociant amb el distribuïdor"
+
+#: ../src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "S'està llegint la clau del servidor"
 
-#: src/protocols/gg/gg.c:843
+#: ../src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "S'està intercanviant la clau hash"
 
-#: src/protocols/gg/gg.c:853
+#: ../src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Error crític a la biblioteca GG\n"
 
-#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/gg/gg.c:727 ../src/protocols/gg/gg.c:818
+#: ../src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Ha fallat la connexió a %s"
 
-#: src/protocols/gg/gg.c:921
+#: ../src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "No s'ha pogut fer ping al servidor"
 
-#: src/protocols/gg/gg.c:933
+#: ../src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Envia com a missatge"
 
-#: src/protocols/gg/gg.c:938
+#: ../src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "S'està cercant el servidor GG"
 
-#: src/protocols/gg/gg.c:941
+#: ../src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "La UIN de Gadu-Gadu especificada no és vàlida"
 
-#: src/protocols/gg/gg.c:987
+#: ../src/protocols/gg/gg.c:841
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Esteu intentant enviar un missatge a una UIN de Gadu-Gadu invàlida."
 
-#: src/protocols/gg/gg.c:1040
+#: ../src/protocols/gg/gg.c:919
 msgid "Couldn't get search results"
 msgstr "No s'han pogut obtenir els resultats de la cerca"
 
-#: src/protocols/gg/gg.c:1045
+#: ../src/protocols/gg/gg.c:924
 msgid "Gadu-Gadu Search Engine"
 msgstr "Cercador de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1071
+#: ../src/protocols/gg/gg.c:950
 msgid "Active"
 msgstr "Actiu"
 
-#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
+#: ../src/protocols/gg/gg.c:955 ../src/protocols/oscar/oscar.c:5191
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
-#: src/protocols/trepia/trepia.c:268
+#: ../src/protocols/gg/gg.c:959 ../src/protocols/jabber/jabber.c:624
+#: ../src/protocols/oscar/oscar.c:5202 ../src/protocols/silc/ops.c:808
+#: ../src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "Nom"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
+#: ../src/protocols/gg/gg.c:964 ../src/protocols/jabber/jabber.c:629
+#: ../src/protocols/oscar/oscar.c:5203 ../src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Cognoms"
 
-#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
-#: src/protocols/silc/ops.c:1202
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/gg/gg.c:1712
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/oscar/oscar.c:5192
+#: ../src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "Sobrenom"
 
-#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
+#: ../src/protocols/gg/gg.c:975 ../src/protocols/gg/gg.c:978
 msgid "Birth Year"
 msgstr "Data de naixement"
 
-#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1109
+#: ../src/protocols/gg/gg.c:984 ../src/protocols/gg/gg.c:986
+#: ../src/protocols/gg/gg.c:988
 msgid "Sex"
 msgstr "Sexe"
 
 #. City
-#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
-#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
+#: ../src/protocols/gg/gg.c:992 ../src/protocols/jabber/jabber.c:639
+#: ../src/protocols/oscar/oscar.c:5246 ../src/protocols/oscar/oscar.c:5254
+#: ../src/protocols/trepia/trepia.c:332 ../src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "Ciutat"
 
-#: src/protocols/gg/gg.c:1156
+#: ../src/protocols/gg/gg.c:1035
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "No hi ha cap llista d'amics al servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:1164
+#: ../src/protocols/gg/gg.c:1043
 msgid "Couldn't Import Buddy List from Server"
 msgstr "No s'ha pogut importar la llista d'amics del servidor"
 
-#: src/protocols/gg/gg.c:1226
+#: ../src/protocols/gg/gg.c:1105
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "S'ha enviat satisfactòriament la llista d'amics al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1234
+#: ../src/protocols/gg/gg.c:1113
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No s'ha pogut transmetre la llista d'amics al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1242
+#: ../src/protocols/gg/gg.c:1121
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
-"S'ha esborrat satisfactòriament la llista d'amics del servidor Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1250
+"S'ha suprimt satisfactòriament la llista d'amics del servidor Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1129
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr "No s'ha pogut esborrar la llista d'amics del servidor Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1259
+msgstr "No s'ha pogut suprimir la llista d'amics del servidor Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1138
 msgid "Password changed successfully"
 msgstr "S'ha canviat la contrasenya"
 
-#: src/protocols/gg/gg.c:1266
+#: ../src/protocols/gg/gg.c:1145
 msgid "Password couldn't be changed"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: src/protocols/gg/gg.c:1385
+#: ../src/protocols/gg/gg.c:1264
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1386
+#: ../src/protocols/gg/gg.c:1265
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5150,11 +5143,11 @@
 "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a "
 "intentar més tard."
 
-#: src/protocols/gg/gg.c:1415
+#: ../src/protocols/gg/gg.c:1294
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1416
+#: ../src/protocols/gg/gg.c:1295
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5162,26 +5155,26 @@
 "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-"
 "Gadu. Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1489
+#: ../src/protocols/gg/gg.c:1368
 msgid "Couldn't export buddy list"
 msgstr "No s'ha pogut exportar la llista d'amics"
 
-#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
+#: ../src/protocols/gg/gg.c:1369 ../src/protocols/gg/gg.c:1392
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho a "
 "intentar més tard."
 
-#: src/protocols/gg/gg.c:1512
+#: ../src/protocols/gg/gg.c:1391
 msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr "No s'ha pogut esborrar la llista d'amics de Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1563
+msgstr "No s'ha pogut suprimir la llista d'amics de Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1442
 msgid "Unable to access directory"
 msgstr "No s'ha pogut accedir al directori"
 
-#: src/protocols/gg/gg.c:1564
+#: ../src/protocols/gg/gg.c:1443
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5189,11 +5182,11 @@
 "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut connectar. "
 "Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1598
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unable to change Gadu-Gadu password"
 msgstr "No s'ha pogut canviar la contrasenya per al Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1599
+#: ../src/protocols/gg/gg.c:1478
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5201,33 +5194,33 @@
 "El Gaim no ha pogut canviar la contrasenya degut a un error mentre es "
 "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1615
+#: ../src/protocols/gg/gg.c:1494
 msgid "Directory Search"
 msgstr "Cerca al directori"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
-#: src/protocols/toc/toc.c:1694
+#: ../src/protocols/gg/gg.c:1499 ../src/protocols/jabber/jabber.c:1100
+#: ../src/protocols/toc/toc.c:1591
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: src/protocols/gg/gg.c:1624
+#: ../src/protocols/gg/gg.c:1503
 msgid "Import Buddy List from Server"
 msgstr "Importa la llista d'amics del servidor"
 
-#: src/protocols/gg/gg.c:1628
+#: ../src/protocols/gg/gg.c:1507
 msgid "Export Buddy List to Server"
 msgstr "Exporta la llista d'amics al servidor"
 
-#: src/protocols/gg/gg.c:1632
+#: ../src/protocols/gg/gg.c:1511
 msgid "Delete Buddy List from Server"
-msgstr "Esborra la llista d'amics del servidor"
-
-#: src/protocols/gg/gg.c:1665
+msgstr "Suprimeix la llista d'amics del servidor"
+
+#: ../src/protocols/gg/gg.c:1544
 msgid "Unable to access user profile."
 msgstr "No s'ha pogut accedir al perfil de l'usuari."
 
-#: src/protocols/gg/gg.c:1666
+#: ../src/protocols/gg/gg.c:1545
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5246,120 +5239,151 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
+#: ../src/protocols/gg/gg.c:1691 ../src/protocols/gg/gg.c:1693
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Connector per al protocol Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
+#: ../src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "Gaim ha trobat un error en la comunicació amb el servidor ICQ."
+
+#: ../src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu."
+
+#: ../src/protocols/icq/gaim_icq.c:296 ../src/protocols/jabber/presence.c:300
+#: ../src/protocols/msn/userlist.c:103 ../src/protocols/oscar/oscar.c:3887
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/yahoo/yahoo.c:1080
+msgid "Authorize"
+msgstr "Autoritza"
+
+#: ../src/protocols/icq/gaim_icq.c:296 ../src/protocols/jabber/presence.c:301
+#: ../src/protocols/msn/userlist.c:104 ../src/protocols/oscar/oscar.c:3889
+#: ../src/protocols/oscar/oscar.c:6453 ../src/protocols/yahoo/yahoo.c:1082
+msgid "Deny"
+msgstr "Denega"
+
+#: ../src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr "Envia el missatge a través del servidor"
+
+#: ../src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "S'està connectant..."
+
+#: ../src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "Sobrenom:"
+
+#: ../src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr "Usuari de Gaim"
+
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1311
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ordre desconeguda: %s"
 
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1030
+#: ../src/protocols/irc/cmds.c:464 ../src/protocols/jabber/chat.c:576
+#: ../src/protocols/silc/silc.c:1019
 #, c-format
 msgid "current topic is: %s"
 msgstr "El tema actual és: %s"
 
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1034
+#: ../src/protocols/irc/cmds.c:468 ../src/protocols/jabber/chat.c:580
+#: ../src/protocols/silc/silc.c:1023
 msgid "No topic is set"
 msgstr "No hi ha cap tema establert"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
-#: src/protocols/yahoo/yahoo_filexfer.c:185
-#: src/protocols/yahoo/yahoo_filexfer.c:194
-#, fuzzy
-msgid "File Transfer Failed"
-msgstr "S'ha cancel·lat la transferència del fitxer"
-
-#: src/protocols/irc/dcc_send.c:273
+#: ../src/protocols/irc/dcc_send.c:272
+#: ../src/protocols/yahoo/yahoo_filexfer.c:176
+#: ../src/protocols/yahoo/yahoo_filexfer.c:185
+#: ../src/protocols/yahoo/yahoo_filexfer.c:194
+msgid "File Transfer Aborted"
+msgstr "S'ha cancel·lat la transferència de fitxers"
+
+#: ../src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "El Gaim no ha pogut obrir un port on escoltar."
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:76
 msgid "Error displaying MOTD"
 msgstr "S'ha produït un error en mostrar la frase del dia"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:76
 msgid "No MOTD available"
 msgstr "La frase del dia no està disponible"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:77
 msgid "There is no MOTD associated with this connection."
 msgstr "No hi ha cap frase del dia associada amb aquesta connexió."
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:80
 #, c-format
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
-#: src/protocols/irc/irc.c:552
+#: ../src/protocols/irc/irc.c:94 ../src/protocols/irc/irc.c:406
 msgid "Server has disconnected"
 msgstr "El servidor ha desconnectat"
 
-#: src/protocols/irc/irc.c:192
+#: ../src/protocols/irc/irc.c:159
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
 
-#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:181 ../src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:186 ../src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: src/protocols/irc/irc.c:242
+#: ../src/protocols/irc/irc.c:218
 msgid "IRC nicks may not contain whitespace"
 msgstr "Els sobrenoms d'IRC no poden contenir espais en blanc"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
-#: src/protocols/jabber/jabber.c:745
-msgid "SSL support unavailable"
-msgstr "El suport per a SSL no està disponible"
-
-#: src/protocols/irc/irc.c:281
+#. connect to the server
+#: ../src/protocols/irc/irc.c:238 ../src/protocols/jabber/jabber.c:798
+#: ../src/protocols/msn/session.c:364 ../src/protocols/napster/napster.c:510
+#: ../src/protocols/novell/novell.c:2152 ../src/protocols/oscar/oscar.c:1760
+#: ../src/protocols/trepia/trepia.c:1065 ../src/protocols/yahoo/yahoo.c:2641
+#: ../src/protocols/zephyr/zephyr.c:1458
+msgid "Connecting"
+msgstr "S'està connectant"
+
+#: ../src/protocols/irc/irc.c:245
 msgid "Couldn't create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
-#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/jabber.c:304
+#: ../src/protocols/oscar/oscar.c:1691 ../src/protocols/oscar/oscar.c:1756
 msgid "Couldn't connect to host"
 msgstr "No s'ha pogut connectar a l'ordinador"
 
-#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
-msgid "Connection Failed"
-msgstr "Ha fallat la connexió"
-
-#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
-msgid "SSL Handshake Failed"
-msgstr "Ha fallat la negociació de la connexió SSL"
-
-#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
-#: src/protocols/trepia/trepia.c:929
+#: ../src/protocols/irc/irc.c:403 ../src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1400
+#: ../src/protocols/irc/irc.c:568 ../src/protocols/silc/chat.c:1373
+#: ../src/protocols/yahoo/yahoochat.c:1444
 msgid "Users"
 msgstr "Usuaris"
 
-#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
+#: ../src/protocols/irc/irc.c:571 ../src/protocols/silc/chat.c:1376
+#: ../src/protocols/silc/ops.c:1166 ../src/protocols/yahoo/yahoochat.c:1453
 msgid "Topic"
 msgstr "Tema"
 
-#: src/protocols/irc/irc.c:738
+#: ../src/protocols/irc/irc.c:608
 msgid "IRC"
-msgstr ""
-
-#: src/protocols/irc/irc.c:742
-#, fuzzy
+msgstr "IRC"
+
+# FIXME
+#: ../src/protocols/irc/irc.c:612
 msgid "Quit message"
-msgstr "(1 missatge)"
+msgstr "Missatge de sortida"
 
 #. *< type
 #. *< ui_requirement
@@ -5369,194 +5393,201 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:828
+#: ../src/protocols/irc/irc.c:699
 msgid "IRC Protocol Plugin"
 msgstr "Connector per al protocol d'IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:829
+#: ../src/protocols/irc/irc.c:700
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "El connector per al protocol d'IRC que és menys dolent"
 
-#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: ../src/protocols/irc/irc.c:719 ../src/protocols/irc/msgs.c:239
+#: ../src/protocols/jabber/jabber.c:1617
+#: ../src/protocols/napster/napster.c:672 ../src/protocols/silc/ops.c:1026
+#: ../src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
-#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
-#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
+#: ../src/protocols/irc/irc.c:722 ../src/protocols/jabber/jabber.c:1638
+#: ../src/protocols/msn/msn.c:1934 ../src/protocols/napster/napster.c:677
+#: ../src/protocols/silc/silc.c:1596 ../src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:854
+#: ../src/protocols/irc/irc.c:725
 msgid "Encodings"
 msgstr "Codificacions"
 
-#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/irc.c:728 ../src/protocols/irc/msgs.c:233
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/silc/buddy.c:1454
+#: ../src/protocols/silc/ops.c:973 ../src/protocols/silc/ops.c:975
+#: ../src/protocols/silc/ops.c:1123 ../src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/protocols/irc/irc.c:860
+#: ../src/protocols/irc/irc.c:731
 msgid "Real name"
 msgstr "Nom real"
 
-#: src/protocols/irc/irc.c:863
-msgid "Use SSL"
-msgstr "Usa SSL"
-
-#: src/protocols/irc/msgs.c:105
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Mode dolent"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr "Us han proscrit de %s"
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr "Proscrit"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No es pot proscriure %s: la llista de proscrits està plena"
 
-#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
-#: src/protocols/irc/msgs.c:247
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:239
+#: ../src/protocols/irc/msgs.c:252
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:218
+#: ../src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr "<i>(identificat)</i>"
 
-#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: ../src/protocols/irc/msgs.c:227 ../src/protocols/irc/msgs.c:233
+#: ../src/protocols/irc/msgs.c:234 ../src/protocols/irc/msgs.c:245
+#: ../src/protocols/msn/msn.c:1327 ../src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
+#: ../src/protocols/irc/msgs.c:234 ../src/protocols/silc/ops.c:967
+#: ../src/protocols/silc/ops.c:1117
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr "Nom real"
 
-#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:245 ../src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Actualment a"
 
-#: src/protocols/irc/msgs.c:245
+#: ../src/protocols/irc/msgs.c:250
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Innactiu durant:</b> %s<br>"
-
-#: src/protocols/irc/msgs.c:247
+msgstr "<b>Inactiu durant:</b> %s<br>"
+
+#: ../src/protocols/irc/msgs.c:252
 msgid "Online since"
 msgstr "En línia des de"
 
-#: src/protocols/irc/msgs.c:250
+#: ../src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjectiu de definició:</b> gloriós<br>"
 
-#: src/protocols/irc/msgs.c:257
+#: ../src/protocols/irc/msgs.c:262
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Informació d'amic per a %s"
 
-#: src/protocols/irc/msgs.c:320
+#: ../src/protocols/irc/msgs.c:325
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:330
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s és: %s"
 
-#: src/protocols/irc/msgs.c:342
+#: ../src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Missatge desconegut '%s'"
 
-#: src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr "Missatge desconegut"
 
-#: src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "El Gaim ha enviat un missatge que el servidor d'IRC no ha entès."
 
-#: src/protocols/irc/msgs.c:366
+#: ../src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuaris a %s: %s"
 
-#: src/protocols/irc/msgs.c:463
+#: ../src/protocols/irc/msgs.c:473
 msgid "Time Response"
 msgstr "Resposta de l'hora"
 
-#: src/protocols/irc/msgs.c:464
+#: ../src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
 msgstr "L'hora local del servidor d'IRC és:"
 
-#: src/protocols/irc/msgs.c:475
+#: ../src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr "Aquest canal no existeix"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:486
+#: ../src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr "aquest canal no existeix"
 
-#: src/protocols/irc/msgs.c:489
+#: ../src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr "L'usuari no està connectat"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr "Nom d'usuari o canal inexistent"
 
-#: src/protocols/irc/msgs.c:514
+#: ../src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr "No s'ha pogut enviar"
 
-#: src/protocols/irc/msgs.c:570
+#: ../src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Per entrar a %s fa falta invitació."
 
-#: src/protocols/irc/msgs.c:571
+#: ../src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr "Només amb invitació"
 
-#: src/protocols/irc/msgs.c:673
+#: ../src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s us ha fet fora: (%s)"
 
-#: src/protocols/irc/msgs.c:678
+#: ../src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s us ha fet fora (%s)"
 
-#: src/protocols/irc/msgs.c:702
+#: ../src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) per %s"
 
-#: src/protocols/irc/msgs.c:786
+#: ../src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr "El sobrenom «%s» no és vàlid"
+
+#: ../src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr "El sobrenom no és vàlid"
+
+#: ../src/protocols/irc/msgs.c:811 ../src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5564,52 +5595,47 @@
 "El servidor ha rebutjat el nom del compte que heu escollit. Possiblement "
 "conté caràcters invàlids."
 
-#: src/protocols/irc/msgs.c:825
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "No es pot canviar el sobrenom"
 
-#: src/protocols/irc/msgs.c:825
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: src/protocols/irc/msgs.c:846
+#: ../src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Heu sortit del canal%s%s"
 
-#: src/protocols/irc/msgs.c:888
+#: ../src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG invàlid del servidor"
 
-#: src/protocols/irc/msgs.c:890
+#: ../src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta al PING -- Retard: %lu segons"
 
-#: src/protocols/irc/msgs.c:965
+#: ../src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No es pot entrar a %s:"
 
-#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:1001 ../src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "No es pot entrar al canal"
 
-#: src/protocols/irc/msgs.c:1000
-#, fuzzy
-msgid "Nick or channel is temporarily unavailable."
-msgstr "El servei està temporalment no disponible."
-
-#: src/protocols/irc/msgs.c:1012
+#: ../src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acció a dur a terme&gt;:  Realitza una acció."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5617,7 +5643,7 @@
 "away [missatge]: Posa un missatge d'absència, o no utilitzeu cap missatge "
 "per deixar d'estar absent."
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5625,7 +5651,7 @@
 "deop &lt;sobrenom1&gt; [sobrenom2] ...:  Treu l'estat d'operador del canal a "
 "algú. Heu de ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5635,7 +5661,7 @@
 "prevenint que parlin al canal si aquest està moderat (+m). Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5643,7 +5669,7 @@
 "invite &lt;sobrenom&gt; [canal]:  Convida algú a que entri al canal indicat, "
 "o al canal actual."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5651,7 +5677,7 @@
 "j &lt;canal1&gt;[,canal2][,...] [clau1[,clau2][,...]]:  Entra a un o més "
 "canals, opcionalment proporcionant una clau si fa falta."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5659,7 +5685,7 @@
 "join &lt;canal1&gt;[,canal2][,...] [clau1[,clau2][,...]]:  Entra a un o més "
 "canals, opcionalment proporcionant una clau si fa falta."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5667,7 +5693,7 @@
 "kick &lt;sobrenom1&gt; [missatge]:  Fa fora a algú del canal. Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5675,11 +5701,11 @@
 "list:  Mostra una llista de canals de xat a la xarxa. <i>Avís, alguns "
 "servidors poden desconnectar-vos si feu això.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acció a dur a terme&gt;:  Realitza una acció."
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5687,7 +5713,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;sobrenom|canal&gt;:  Estableix o no el "
 "mode del canal o d'usuari."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5695,15 +5721,15 @@
 "msg &lt;sobrenom&gt; &lt;missatge&gt;:  Envia un missatge privat a l'usuari "
 "(contràriament a enviar-lo al canal)."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Llista els usuaris connectats al canal."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
+#: ../src/protocols/irc/parse.c:126 ../src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;sobrenom nou&gt;:  Canvia el vostre sobrenom."
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5711,7 +5737,7 @@
 "op &lt;sobrenom1&gt; [nick2] ...:  Dóna estat d'operador del canal a algú. "
 "Heu de ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5719,7 +5745,7 @@
 "operwall &lt;missatge&gt;:  Si no sabeu què és això, segurament no podeu fer-"
 "ho servir."
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5727,7 +5753,7 @@
 "part [canal] [missatge]:  Surt del canal actual, o de l'especificat, amb un "
 "missatge opcional."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5735,7 +5761,7 @@
 "ping [sobrenom]:  Indica el retard que té un usuari (o el servidor si no "
 "s'indica cap usuari)."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5743,15 +5769,15 @@
 "query &lt;sobrenom&gt; &lt;missatge&gt;: envia un missatge privat a l'usuari "
 "(contràriament al canal)."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [missatge]: Desconnecta del servidor amb un missatge opcional."
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Envia un missatge en brut al servidor."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5759,19 +5785,19 @@
 "remove &lt;sobrenom&gt; [missatge]:  Suprimeix algú de la sala. Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Mostra l'hora local del servidor d'IRC."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [tema nou]: Visualitza o canvia el tema del canal."
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Posa o treu un mode d'usuari."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5779,7 +5805,7 @@
 "voice &lt;sobrenom1&gt; [sobrenom2] ...:  Dóna estat de veu a algú. Heu de "
 "ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5787,31 +5813,31 @@
 "wallops &lt;missatge&gt;: Si no sabeu què és això, segurament és que no "
 "podeu fer-ho servir."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;sobrenom&gt;:  Obté informació sobre un usuari."
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de resposta de %s: %lu segons"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "Resposta de CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1648 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:525 ../src/protocols/irc/parse.c:529
+#: ../src/protocols/oscar/oscar.c:1588 ../src/protocols/toc/toc.c:188
+#: ../src/protocols/toc/toc.c:596 ../src/protocols/toc/toc.c:612
+#: ../src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "Desconnectat."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5819,22 +5845,22 @@
 "El servidor requereix TLS/SSL per a entrar. Seleccioneu \"Usa TLS si està "
 "disponible\" en les propietats del compte"
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:54
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "El servidor requereix TLS/SSL per entrar. No s'ha trobat suport per a TLS/"
 "SSL."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor requereix autenticació de text sobre un fulxe no xifrat"
 
-#: 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:164 ../src/protocols/jabber/auth.c:165
+#: ../src/protocols/jabber/auth.c:242 ../src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:166 ../src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5842,100 +5868,106 @@
 "Aquest servidor requereix autenticació de text sobre un flux no xifrat. "
 "Voleu permetre això i continuar amb l'autenticació?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:174 ../src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr "No hi ha cap mètode d'autenticació compatible amb aquest servidor"
 
-#: src/protocols/jabber/auth.c:396
+#: ../src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/buddy.c:246 ../src/protocols/jabber/buddy.c:613
+#: ../src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Nom"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:247 ../src/protocols/jabber/buddy.c:626
+#: ../src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Cognoms"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
+#: ../src/protocols/jabber/buddy.c:248 ../src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr "Nom comú"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1009
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:644
+#: ../src/protocols/jabber/jabber.c:619 ../src/protocols/msn/msn.c:1317
+#: ../src/protocols/silc/buddy.c:1451 ../src/protocols/silc/ops.c:820
+#: ../src/protocols/silc/ops.c:963 ../src/protocols/silc/ops.c:1113
+#: ../src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr "Adreça"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr "Adreça (cont.)"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr "Ubicació"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr "Província"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:653
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr "Codi postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
-#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:689
+#: ../src/protocols/trepia/trepia.c:340 ../src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/buddy.c:755
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
-#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:726 ../src/protocols/silc/silc.c:656
+#: ../src/protocols/silc/util.c:511
+#: ../src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr "Nom de l'organització"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:751
+#: ../src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "Títol"
+
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5338
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:647
+#: ../src/protocols/oscar/oscar.c:5227
 msgid "Birthday"
 msgstr "Data de naixement"
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
+#: ../src/protocols/jabber/buddy.c:509 ../src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Edita la vCard del Jabber"
 
-#: src/protocols/jabber/buddy.c:565
+#: ../src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5943,574 +5975,597 @@
 "Les dades de continuació són opcionals. Entreu només la informació que us "
 "sembli."
 
-#: src/protocols/jabber/buddy.c:610
+#: ../src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr "ID per al Jabber"
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
-msgid "Resource"
-msgstr "Recurs"
-
-#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:566 ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/jabber/buddy.c:586 ../src/protocols/jabber/jabber.c:971
+#: ../src/protocols/msn/msn.c:489 ../src/protocols/novell/novell.c:2819
+#: ../src/protocols/novell/novell.c:2823 ../src/protocols/oscar/oscar.c:731
+#: ../src/protocols/oscar/oscar.c:737 ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/yahoo/yahoo.c:2903
+msgid "Status"
+msgstr "Estat"
+
+#: ../src/protocols/jabber/buddy.c:634 ../src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "Primer Cognom"
 
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:652 ../src/protocols/jabber/jabber.c:634
+#: ../src/protocols/oscar/oscar.c:5245 ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Adreça"
 
-#: src/protocols/jabber/buddy.c:712
+#: ../src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr "Compte postal"
 
-#: src/protocols/jabber/buddy.c:824
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:824
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr "Logotip"
 
-#: src/protocols/jabber/buddy.c:849
+#: ../src/protocols/jabber/buddy.c:786
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:1031
+#: ../src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr "No m'amaguis de"
 
-#: src/protocols/jabber/buddy.c:1034
+#: ../src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr "Amaga-me'n temporalment"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1041
+#: ../src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr "Cancel·la la notificació de presència"
 
-#: src/protocols/jabber/buddy.c:1047
+#: ../src/protocols/jabber/buddy.c:957
 msgid "(Re-)Request authorization"
 msgstr "Tornar a demanar l'autorització"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1055
+#: ../src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr "Dessubscriu"
 
-#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
-msgid "Chatty"
-msgstr "Xerraire"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
-#: src/status.c:160
-msgid "Extended Away"
-msgstr "Absent durant una bona estona"
-
-#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
-#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
-msgid "Do Not Disturb"
-msgstr "No molesteu"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
-#: src/protocols/yahoo/yahoochat.c:995
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:6523
+#: ../src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "_Gestor:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no és un nom de sala vàlid"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr "El nom de sala no és vàlid"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no és un nom de servidor vàlid"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:219 ../src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "Nom de servidor invàlid"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no és un nom de gestor de sala vàlid"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:225 ../src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr "El nom del gestor no és vàlid"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "Hi ha un error en la configuració"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:388 ../src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "No s'ha pogut configurar"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr "Error en la configuració de la sala"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr "Aquest sala no es pot configurar"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:455 ../src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr "S'ha produït un error en el registre"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "El canvi de sobrenom no està suportat en sales de xat no-MUC"
-
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1239
-#, fuzzy
-msgid "Error retrieving room list"
+msgstr "El canvi de sobrenom no està permès en sales de xat no-MUC"
+
+#: ../src/protocols/jabber/chat.c:651 ../src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "Error en la llista de sales"
+
+#: ../src/protocols/jabber/chat.c:652 ../src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
 msgstr "S'ha produït un error en obtenir la llista de sales"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr "Servidor invàlid"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "Entreu un servidor de conferències"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "Seleccioneu a quin servidor de conferencies consultar"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-#: src/protocols/jabber/jabber.c:78
+#: ../src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "S'ha produït un error en inicialitzar la sessió"
 
-#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
+#: ../src/protocols/jabber/jabber.c:213 ../src/protocols/trepia/trepia.c:248
+#: ../src/protocols/trepia/trepia.c:699 ../src/protocols/trepia/trepia.c:988
+#: ../src/protocols/trepia/trepia.c:1032 ../src/protocols/trepia/trepia.c:1131
+#: ../src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
+#: ../src/protocols/jabber/jabber.c:251 ../src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
+#: ../src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "Ha fallat la connexió"
+
+#: ../src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "Ha fallat la negociació de la connexió SSL"
+
+#: ../src/protocols/jabber/jabber.c:378 ../src/protocols/jabber/jabber.c:711
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber invàlid"
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1075
+#: ../src/protocols/jabber/jabber.c:409 ../src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "El suport per a SSL no està disponible"
+
+#: ../src/protocols/jabber/jabber.c:419 ../src/protocols/jabber/jabber.c:751
+#: ../src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: src/protocols/jabber/jabber.c:448
+#: ../src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "S'ha registrat %s a %s amb èxit"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
+#: ../src/protocols/jabber/jabber.c:446 ../src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr "S'ha registrat amb èxit"
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
+#: ../src/protocols/jabber/jabber.c:453 ../src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr "Error desconegut"
 
-#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
+#: ../src/protocols/jabber/jabber.c:455 ../src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr "Ha fallat el registre"
 
-#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
+#: ../src/protocols/jabber/jabber.c:567 ../src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr "Ja esteu registrat"
 
-#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
+#: ../src/protocols/jabber/jabber.c:603 ../src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/protocols/jabber/jabber.c:618
+#: ../src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr "Correu electrònic"
 
 #. State
-#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
-#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
-#: src/protocols/trepia/trepia.c:414
+#: ../src/protocols/jabber/jabber.c:644 ../src/protocols/oscar/oscar.c:5247
+#: ../src/protocols/oscar/oscar.c:5255 ../src/protocols/trepia/trepia.c:336
+#: ../src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Estat"
 
-#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:654 ../src/protocols/silc/ops.c:853
+#: ../src/protocols/silc/silc.c:658 ../src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telèfon"
 
-#: src/protocols/jabber/jabber.c:668
+#: ../src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr "Data"
 
-#: src/protocols/jabber/jabber.c:676
+#: ../src/protocols/jabber/jabber.c:672
 msgid "Please fill out the information below to register your new account."
 msgstr "Empleneu els camps següents per registrar un compte nou."
 
-#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
+#: ../src/protocols/jabber/jabber.c:675 ../src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr "Registra un compte Jabber nou"
 
-#: src/protocols/jabber/jabber.c:811
+#: ../src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr "Desconnectat"
+
+#: ../src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "S'està inicialitzant el flux"
 
-#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:808 ../src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "S'està autenticant"
 
-#: src/protocols/jabber/jabber.c:826
+#: ../src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr "S'està reinicialitzant el flux"
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
-#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
-#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
+#: ../src/protocols/jabber/jabber.c:897 ../src/protocols/jabber/jabber.c:1197
+#: ../src/protocols/jabber/jabber.c:1238 ../src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/oscar/oscar.c:737 ../src/protocols/oscar/oscar.c:6807
 msgid "Not Authorized"
 msgstr "No Autoritzat"
 
-#: src/protocols/jabber/jabber.c:930
+#: ../src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr "Ambdós"
 
-#: src/protocols/jabber/jabber.c:932
+#: ../src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr "De (a pendent)"
 
-#: src/protocols/jabber/jabber.c:934
+#: ../src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:937
+#: ../src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr "A"
 
-#: src/protocols/jabber/jabber.c:939
+#: ../src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#: src/protocols/jabber/jabber.c:943
+#: ../src/protocols/jabber/jabber.c:951
 msgid "Subscription"
 msgstr "Subscripció"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
-msgid "Priority"
-msgstr "Prioritat"
-
-#: src/protocols/jabber/jabber.c:1034
+#: ../src/protocols/jabber/jabber.c:984
+msgid "Error"
+msgstr "Error"
+
+#: ../src/protocols/jabber/jabber.c:997 ../src/protocols/jabber/jutil.c:35
+#: ../src/protocols/jabber/presence.c:72
+#: ../src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "Xerraire"
+
+#: ../src/protocols/jabber/jabber.c:999 ../src/protocols/jabber/jutil.c:38
+#: ../src/protocols/jabber/presence.c:74
+#: ../src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "Absent durant una bona estona"
+
+#: ../src/protocols/jabber/jabber.c:1000 ../src/protocols/jabber/jutil.c:41
+#: ../src/protocols/jabber/presence.c:76
+#: ../src/protocols/jabber/presence.c:137 ../src/protocols/oscar/oscar.c:679
+#: ../src/protocols/oscar/oscar.c:5805 ../src/protocols/oscar/oscar.c:7000
+msgid "Do Not Disturb"
+msgstr "No molesteu"
+
+#: ../src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr "S'ha canviat la contrasenya"
 
-#: src/protocols/jabber/jabber.c:1035
+#: ../src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr "La vostra contrasenya s'ha canviat."
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
+#: ../src/protocols/jabber/jabber.c:1022 ../src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
-msgstr "S'ha produït un error en canviar la contrsaenya"
-
-#: src/protocols/jabber/jabber.c:1096
+msgstr "S'ha produït un error en canviar la contrsenya"
+
+#: ../src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "Contrasenya (repetiu-la)"
 
-#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/jabber.c:1084 ../src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "Canvia la contrasenya per al Jabber"
 
-#: src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "Introduïu la nova contrasenya"
 
-#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
+#: ../src/protocols/jabber/jabber.c:1095 ../src/protocols/toc/toc.c:1581
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
-#: src/protocols/jabber/jabber.c:1194
+#: ../src/protocols/jabber/jabber.c:1177
 msgid "Bad Request"
 msgstr "Sol·licitud incorrecta"
 
-#: src/protocols/jabber/jabber.c:1196
+#: ../src/protocols/jabber/jabber.c:1179
 msgid "Conflict"
 msgstr "Conflicte"
 
-#: src/protocols/jabber/jabber.c:1198
+#: ../src/protocols/jabber/jabber.c:1181
 msgid "Feature Not Implemented"
 msgstr "La característica no està implementada"
 
-#: src/protocols/jabber/jabber.c:1200
+#: ../src/protocols/jabber/jabber.c:1183
 msgid "Forbidden"
 msgstr "Prohibit"
 
-#: src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1185
 msgid "Gone"
 msgstr "Desaparegut"
 
-#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
+#: ../src/protocols/jabber/jabber.c:1187 ../src/protocols/jabber/jabber.c:1261
 msgid "Internal Server Error"
 msgstr "Error intern del servidor"
 
-#: src/protocols/jabber/jabber.c:1206
+#: ../src/protocols/jabber/jabber.c:1189
 msgid "Item Not Found"
 msgstr "No s'ha trobat l'element"
 
-#: src/protocols/jabber/jabber.c:1208
+#: ../src/protocols/jabber/jabber.c:1191
 msgid "Malformed Jabber ID"
 msgstr "l'ID Jabber està mal format"
 
-#: src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
 msgstr "No acceptable"
 
-#: src/protocols/jabber/jabber.c:1212
+#: ../src/protocols/jabber/jabber.c:1195
 msgid "Not Allowed"
 msgstr "No permès"
 
-#: src/protocols/jabber/jabber.c:1216
+#: ../src/protocols/jabber/jabber.c:1199
 msgid "Payment Required"
 msgstr "De pagament"
 
-#: src/protocols/jabber/jabber.c:1218
+#: ../src/protocols/jabber/jabber.c:1201
 msgid "Recipient Unavailable"
 msgstr "El destinatari no està disponible"
 
-#: src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1205
 msgid "Registration Required"
 msgstr "Cal registre"
 
-#: src/protocols/jabber/jabber.c:1224
+#: ../src/protocols/jabber/jabber.c:1207
 msgid "Remote Server Not Found"
 msgstr "No s'ha trobat el servidor remot"
 
-#: src/protocols/jabber/jabber.c:1226
+#: ../src/protocols/jabber/jabber.c:1209
 msgid "Remote Server Timeout"
 msgstr "El servidor remot ha excedit el temps d'espera"
 
-#: src/protocols/jabber/jabber.c:1228
+#: ../src/protocols/jabber/jabber.c:1211
 msgid "Server Overloaded"
 msgstr "El servidor està sobrecarregat"
 
-#: src/protocols/jabber/jabber.c:1230
+#: ../src/protocols/jabber/jabber.c:1213
 msgid "Service Unavailable"
 msgstr "El servei no està disponible"
 
-#: src/protocols/jabber/jabber.c:1232
+#: ../src/protocols/jabber/jabber.c:1215
 msgid "Subscription Required"
 msgstr "Cal subscripció"
 
-#: src/protocols/jabber/jabber.c:1234
+#: ../src/protocols/jabber/jabber.c:1217
 msgid "Unexpected Request"
 msgstr "Sol·licitut inesperada"
 
-#: src/protocols/jabber/jabber.c:1241
+#: ../src/protocols/jabber/jabber.c:1224
 msgid "Authorization Aborted"
 msgstr "S'ha avortat l'autorització"
 
-#: src/protocols/jabber/jabber.c:1243
+#: ../src/protocols/jabber/jabber.c:1226
 msgid "Incorrect encoding in authorization"
 msgstr "La codificació de l'autorització no és correcta"
 
-#: src/protocols/jabber/jabber.c:1246
+#: ../src/protocols/jabber/jabber.c:1229
 msgid "Invalid authzid"
 msgstr "Authzid invàlid"
 
-#: src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1232
 msgid "Invalid Authorization Mechanism"
 msgstr "El mecanisme d'autorització no és vàlid"
 
-#: src/protocols/jabber/jabber.c:1252
+#: ../src/protocols/jabber/jabber.c:1235
 msgid "Authorization mechanism too weak"
 msgstr "El mecanisme d'autorització és massa feble"
 
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1240
 msgid "Temporary Authentication Failure"
 msgstr "Ha fallat temporalment l'autenticació"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1242
 msgid "Authentication Failure"
 msgstr "S'ha produït un error en l'autenticació"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1246
 msgid "Bad Format"
 msgstr "Format incorrecte"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1248
 msgid "Bad Namespace Prefix"
 msgstr "Prefix d'espai de noms incorrecte"
 
-#: src/protocols/jabber/jabber.c:1268
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Resource Conflict"
 msgstr "Conflicte de recurs"
 
-#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
+#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/silc/ops.c:1519
 msgid "Connection Timeout"
 msgstr "La connexió ha excedit el temps d'espera"
 
-#: src/protocols/jabber/jabber.c:1272
+#: ../src/protocols/jabber/jabber.c:1255
 msgid "Host Gone"
 msgstr "L'ordinador ha desaparegut"
 
-#: src/protocols/jabber/jabber.c:1274
+#: ../src/protocols/jabber/jabber.c:1257
 msgid "Host Unknown"
 msgstr "Servidor desconegut"
 
-#: src/protocols/jabber/jabber.c:1276
+#: ../src/protocols/jabber/jabber.c:1259
 msgid "Improper Addressing"
 msgstr "Adreçament incorrecte"
 
-#: src/protocols/jabber/jabber.c:1280
+#: ../src/protocols/jabber/jabber.c:1263
 msgid "Invalid ID"
 msgstr "ID invàlid"
 
-#: src/protocols/jabber/jabber.c:1282
+#: ../src/protocols/jabber/jabber.c:1265
 msgid "Invalid Namespace"
 msgstr "Espai de noms invàlid"
 
-#: src/protocols/jabber/jabber.c:1284
+#: ../src/protocols/jabber/jabber.c:1267
 msgid "Invalid XML"
 msgstr "XML invàlid"
 
-#: src/protocols/jabber/jabber.c:1286
+#: ../src/protocols/jabber/jabber.c:1269
 msgid "Non-matching Hosts"
 msgstr "Ordinadors no coincidents"
 
-#: src/protocols/jabber/jabber.c:1290
+#: ../src/protocols/jabber/jabber.c:1273
 msgid "Policy Violation"
 msgstr "Violació de la política"
 
-#: src/protocols/jabber/jabber.c:1292
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexió remota"
 
 # Mirar com es traduïa 'Constraint variables'
-#: src/protocols/jabber/jabber.c:1294
+#: ../src/protocols/jabber/jabber.c:1277
 msgid "Resource Constraint"
 msgstr "Restriccions del recurs"
 
-#: src/protocols/jabber/jabber.c:1296
+#: ../src/protocols/jabber/jabber.c:1279
 msgid "Restricted XML"
 msgstr "XML restringit"
 
-#: src/protocols/jabber/jabber.c:1298
+#: ../src/protocols/jabber/jabber.c:1281
 msgid "See Other Host"
 msgstr "Veu altres ordinadors"
 
-#: src/protocols/jabber/jabber.c:1300
+#: ../src/protocols/jabber/jabber.c:1283
 msgid "System Shutdown"
 msgstr "Apagada del Sistema"
 
-#: src/protocols/jabber/jabber.c:1302
+#: ../src/protocols/jabber/jabber.c:1285
 msgid "Undefined Condition"
 msgstr "Condició no definida"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1287
 msgid "Unsupported Encoding"
-msgstr "Codificació no suportada"
-
-#: src/protocols/jabber/jabber.c:1306
+msgstr "La codificació no està implementada"
+
+#: ../src/protocols/jabber/jabber.c:1289
 msgid "Unsupported Stanza Type"
-msgstr "Tipus de permanència no suportat"
-
-#: src/protocols/jabber/jabber.c:1308
+msgstr "El tipus de permanència no està implementada"
+
+#: ../src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Version"
-msgstr "Versió no suportada"
-
-#: src/protocols/jabber/jabber.c:1310
+msgstr "Aquesta versió no està implementada"
+
+#: ../src/protocols/jabber/jabber.c:1293
 msgid "XML Not Well Formed"
 msgstr "XML mal format"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1295
 msgid "Stream Error"
 msgstr "Error de flux"
 
-#: src/protocols/jabber/jabber.c:1379
+#: ../src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No s'ha pogut proscriure l'usuari %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1414
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No s'ha pogut fer fora l'usuari %s"
 
-#: src/protocols/jabber/jabber.c:1457
+#: ../src/protocols/jabber/jabber.c:1440
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura la sala de xat."
 
-#: src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura la sala de xat."
 
-#: src/protocols/jabber/jabber.c:1470
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Surt de la sala."
 
-#: src/protocols/jabber/jabber.c:1475
+#: ../src/protocols/jabber/jabber.c:1458
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra a una sala de xat."
 
-#: src/protocols/jabber/jabber.c:1481
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [tema nou]:  Mostra o canvia el tema."
 
-#: src/protocols/jabber/jabber.c:1487
+#: ../src/protocols/jabber/jabber.c:1470
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [sala]:  Proscriu un usuari de la sala."
 
-#: src/protocols/jabber/jabber.c:1493
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1476
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  Convida un usuari a la sala."
 
-#: src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1482
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;sala&gt; [servidor]:  Entra en un xat d'aquest servidor."
 
-#: src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1488
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuari&gt; [sala]:  Fa fora de la sala un usuari."
 
-#: src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1493
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuari&gt; &lt;missatge&gt;:  Envia un missatge privat a un altre "
 "usuari."
 
+#: ../src/protocols/jabber/jabber.c:1508
+msgid "Hide Operating System"
+msgstr "Oculta el sistema operatiu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6521,91 +6576,79 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
+#: ../src/protocols/jabber/jabber.c:1595 ../src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr "Connector per al protocol Jabber"
 
-#: src/protocols/jabber/jabber.c:1618
+#: ../src/protocols/jabber/jabber.c:1620
+msgid "Resource"
+msgstr "Recurs"
+
+#: ../src/protocols/jabber/jabber.c:1623
 msgid "Use TLS if available"
 msgstr "Usa TLS si està disponible"
 
-#: src/protocols/jabber/jabber.c:1623
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Force old (port 5223) SSL"
+#: ../src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
 msgstr "Força antic SSL"
 
-#: src/protocols/jabber/jabber.c:1631
+#: ../src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxes sense xifrar"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
+#: ../src/protocols/jabber/jabber.c:1642 ../src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr "Servidor on connectar-se"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Missatge de %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema és: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "No s'ha pogut fer arribar el missatge a %s: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Missatge d'error de Jabber"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Codi %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Error en l'anàlisi de l'XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "L'usuari %s vol afegir %s a la seva llista d'amics."
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
-#: src/protocols/yahoo/yahoo.c:861
-msgid "Authorize"
-msgstr "Autoritza"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoo.c:863
-msgid "Deny"
-msgstr "Denega"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:293
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "L'usuari %s vol afegir-vos a la seva llista d'amics."
+
+#: ../src/protocols/jabber/presence.c:348
+#: ../src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6613,41 +6656,41 @@
 "Ara es crearà una nova sala. Voleu configurar-la o acceptar els valors "
 "predeterminats?"
 
-#: src/protocols/jabber/presence.c:349
+#: ../src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr "Configura la sala"
 
-#: src/protocols/jabber/presence.c:351
+#: ../src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr "Accepta els valors predeterminats"
 
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr "S'ha produït un error en el xat %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr "S'ha produït un error en entrar al xat %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No s'ha pogut enviar el fitxer a %s, atès que l'usuari no permet la "
 "transferència de fitxers"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:595 ../src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:91
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronització de la llista d'amics a %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:97
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6656,7 +6699,7 @@
 "%s de la llista local està dins el grup \"%s\", però no a la llista del "
 "servidor. Voleu afegir aquest amic?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:105
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6665,259 +6708,259 @@
 "%s està a la llista local però no a la del servidor. Voleu afegir aquest "
 "amic?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Error de sintaxi (probablement errada al Gaim)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "L'adreça de correu no és vàlida"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "L'usuari no existeix."
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Fa falta un nom de domini totalment qualificat"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Ja esteu connectat"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "El nom d'usuari no és vàlid"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "El nom amistós no és vàlid"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Llista plena"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Ja hi és"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "No és a la llista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:686
 msgid "User is offline"
 msgstr "L'usuari està fora de línia"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Ja esteu en aquest mode"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Ja és a la llista contrària"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Massa grups"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "El nom del grup no és vàlid"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "L'usuari no és al grup"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "El nom del grup és massa llarg"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "No es pot suprimir el grup zero"
 
-#: src/protocols/msn/error.c:95
+#: ../src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "S'ha intentat afegir un contacte a un grup que no existeix"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Ha fallat el Switchboard"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Ha fallat la transferència de la notificació"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Falten camps obligatoris"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Massa coincidències per un FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:193
 msgid "Not logged in"
 msgstr "No està connectat"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "El servei està temporalment fora de servei."
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Error del servidor de bases de dades"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "S'ha inhabilitat l'ordre"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "S'ha produït un error en una operació de fitxer"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "S'ha produït un error en reservar memòria"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "S'ha enviat un valor de CHL incorrecte al servidor"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "El servidor està ocupat"
 
-#: 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 "El servidor no està disponible"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "El servidor de notificacions d'igual a igual està aturat"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "S'ha produït un error en la connexió a la base de dades"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor passarà a no estar disponible (abandoneu el vaixell)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Els paràmetres de CVR són o bé desconeguts o bé no permesos"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "No és possible escriure"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "La sessió està sobrecarregada"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "L'usuari està massa actiu"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Massa sessions"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "El passaport no està verificat"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Fitxer d'amics incorrecte"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Inesperat"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "El nom amistós canvia massa depressa"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "El servidor està massa ocupat"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
-#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2273
+#: ../src/protocols/silc/ops.c:1508 ../src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "No està permès mentre estigueu fora de línia"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "No s'accepten usuaris nous"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Passaport per als nens sense consentiment patern"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Tiquet incorrecte"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Codi d'error desconegut %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Error d'MSN: %s\n"
 
-#: src/protocols/msn/msn.c:114
+#: ../src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "El vostre nom amistós nou d'MSN és massa llarg."
 
-#: src/protocols/msn/msn.c:222
+#: ../src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistós."
 
-#: src/protocols/msn/msn.c:223
+#: ../src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Aquest és el nom amb el que els amics de l'MSN us veuran."
 
-#: src/protocols/msn/msn.c:239
+#: ../src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Estableix el número de telèfon de casa."
 
-#: src/protocols/msn/msn.c:254
+#: ../src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Estableix el número de telèfon de la feina."
 
-#: src/protocols/msn/msn.c:269
+#: ../src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Estableix el número de telèfon del mòbil."
 
-#: src/protocols/msn/msn.c:282
+#: ../src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "Voleu permetre pàgines de mòbil d'MSN?"
 
-#: src/protocols/msn/msn.c:283
+#: ../src/protocols/msn/msn.c:283
 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?"
@@ -6925,25 +6968,24 @@
 "Voleu permetre a les persones de la llista d'amics enviar-vos pàgines de "
 "mòbil de MSN al vostre telèfon mòbil o a algun altre dispositiu mòbil?"
 
-#: src/protocols/msn/msn.c:287
+#: ../src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Permet"
 
-#: src/protocols/msn/msn.c:288
+#: ../src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Denega"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Envia un missatge de mòbil."
 
-#: src/protocols/msn/msn.c:313
+#: ../src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Pàgina"
 
-#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
-#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2762
+#: ../src/protocols/msn/msn.c:489 ../src/protocols/msn/msn.c:497
+#: ../src/protocols/msn/msn.c:500 ../src/protocols/yahoo/yahoo.c:2903
 #, c-format
 msgid ""
 "\n"
@@ -6952,171 +6994,180 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:508
+#: ../src/protocols/msn/msn.c:497
 msgid "Has you"
 msgstr "Us té"
 
-#: src/protocols/msn/msn.c:511
+#: ../src/protocols/msn/msn.c:500
 msgid "Blocked"
 msgstr "Blocat"
 
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
+#: ../src/protocols/msn/msn.c:514 ../src/protocols/msn/msn.c:801
+#: ../src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Lluny de l'ordinador"
+
+#: ../src/protocols/msn/msn.c:515 ../src/protocols/msn/msn.c:803
+#: ../src/protocols/msn/state.c:33 ../src/protocols/yahoo/yahoo.c:2760
+#: ../src/protocols/yahoo/yahoo.c:3127 ../src/protocols/yahoo/yahoo.c:3243
 msgid "Be Right Back"
 msgstr "Tornaré de seguida"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
-#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
-#: src/protocols/yahoo/yahoo.c:3189
+#: ../src/protocols/msn/msn.c:516 ../src/protocols/msn/msn.c:805
+#: ../src/protocols/msn/state.c:31 ../src/protocols/novell/novell.c:2803
+#: ../src/protocols/novell/novell.c:2918 ../src/protocols/novell/novell.c:2972
+#: ../src/protocols/silc/buddy.c:1392 ../src/protocols/silc/silc.c:48
+#: ../src/protocols/silc/silc.c:83 ../src/protocols/yahoo/yahoo.c:2762
+#: ../src/protocols/yahoo/yahoo.c:3129 ../src/protocols/yahoo/yahoo.c:3244
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
+#: ../src/protocols/msn/msn.c:517 ../src/protocols/msn/msn.c:807
+#: ../src/protocols/msn/state.c:35 ../src/protocols/yahoo/yahoo.c:2770
+#: ../src/protocols/yahoo/yahoo.c:3137 ../src/protocols/yahoo/yahoo.c:3248
 msgid "On The Phone"
 msgstr "Al telèfon"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
+#: ../src/protocols/msn/msn.c:518 ../src/protocols/msn/msn.c:809
+#: ../src/protocols/msn/state.c:36 ../src/protocols/yahoo/yahoo.c:2774
+#: ../src/protocols/yahoo/yahoo.c:3141 ../src/protocols/yahoo/yahoo.c:3250
 msgid "Out To Lunch"
 msgstr "Fora esmorzant"
 
-#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:158
+#: ../src/protocols/msn/msn.c:519 ../src/protocols/msn/msn.c:811
+#: ../src/protocols/zephyr/zephyr.c:2099 ../src/protocols/zephyr/zephyr.c:2131
 msgid "Hidden"
 msgstr "Ocult"
 
-#: src/protocols/msn/msn.c:570
+#: ../src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr "Estableix el nom amistós"
 
-#: src/protocols/msn/msn.c:575
+#: ../src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr "Estableix el número de telèfon de casa"
 
-#: src/protocols/msn/msn.c:579
+#: ../src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr "Estableix el número de telèfon de la feina"
 
-#: src/protocols/msn/msn.c:583
+#: ../src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr "Estableix el número del telèfon mòbil"
 
-#: src/protocols/msn/msn.c:589
+#: ../src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr "Habilita/inhabilita dispositius mòbils"
 
-#: src/protocols/msn/msn.c:594
+#: ../src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permet/denega pàgines de mòbil"
 
-#: src/protocols/msn/msn.c:617
+#: ../src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr "Envia a un mòbil"
 
-#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+#: ../src/protocols/msn/msn.c:586 ../src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "Inicia un _xat"
 
-#: src/protocols/msn/msn.c:663
+#: ../src/protocols/msn/msn.c:623
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
-"L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL suportada. Vegeu "
+"L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa. Vegeu "
 "http://gaim.sf.net/faq-ssl.php (en anglès) per a més informació."
 
-#: src/protocols/msn/msn.c:691
+#: ../src/protocols/msn/msn.c:651
 msgid "Failed to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1309 ../src/protocols/yahoo/yahoo_profile.c:659
+#: ../src/protocols/zephyr/zephyr.c:717 ../src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Àlies:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
+#: ../src/protocols/msn/msn.c:1317 ../src/protocols/msn/msn.c:1675
+#: ../src/protocols/yahoo/yahoo_profile.c:1174 ../src/util.c:796
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1425
+#: ../src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: ../src/protocols/msn/msn.c:1410 ../src/protocols/msn/msn.c:1662
+#: ../src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
-#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1024
+#: ../src/protocols/msn/msn.c:1481 ../src/protocols/oscar/oscar.c:5232
+#: ../src/protocols/trepia/trepia.c:286 ../src/protocols/trepia/trepia.c:405
+#: ../src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr "Edat"
 
 #. Gender
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
-#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1034
+#: ../src/protocols/msn/msn.c:1488 ../src/protocols/oscar/oscar.c:5218
+#: ../src/protocols/trepia/trepia.c:280 ../src/protocols/trepia/trepia.c:407
+#: ../src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr "Sexe"
 
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
+#: ../src/protocols/msn/msn.c:1497 ../src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr "Estat civil"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: ../src/protocols/msn/msn.c:1504 ../src/protocols/novell/novell.c:1445
+#: ../src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr "Ubicació"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
+#: ../src/protocols/msn/msn.c:1512 ../src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr "Ocupació"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: ../src/protocols/msn/msn.c:1529 ../src/protocols/msn/msn.c:1535
+#: ../src/protocols/msn/msn.c:1542 ../src/protocols/msn/msn.c:1550
+#: ../src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr "Una mica sobre mi"
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: ../src/protocols/msn/msn.c:1566 ../src/protocols/msn/msn.c:1572
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr "Coses preferides"
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: ../src/protocols/msn/msn.c:1595 ../src/protocols/msn/msn.c:1601
+#: ../src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr "Aficions i interessos"
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: ../src/protocols/msn/msn.c:1617 ../src/protocols/msn/msn.c:1623
+#: ../src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr "Cita textual favorita"
 
-#: src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr "Última actualització"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
-#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
+#: ../src/protocols/msn/msn.c:1642 ../src/protocols/silc/ops.c:844
+#: ../src/protocols/trepia/trepia.c:290 ../src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Pàgina web"
 
-#: src/protocols/msn/msn.c:1684
+#: ../src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr "L'usuari no ha creat cap perfil públic."
 
-#: src/protocols/msn/msn.c:1685
+#: ../src/protocols/msn/msn.c:1665
 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 "
@@ -7125,7 +7176,7 @@
 "L'MSN no ha pogut trobar el perfil de l'usuari. Això pot voler dir que o bé "
 "l'usuari no existeix, o que existeix però el seu perfil no és públic."
 
-#: src/protocols/msn/msn.c:1689
+#: ../src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7133,10 +7184,18 @@
 "El Gaim no ha pogut trobar informació del perfil de l'usuari. El més segur "
 "és que l'usuari no existeixi."
 
-#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
+#: ../src/protocols/msn/msn.c:1675 ../src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr "URL del perfil"
 
+#: ../src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr "Mostra notícies tancades de la conversa"
+
+#: ../src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr "Mostra notificacions de temps excedit"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7147,73 +7206,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
+#: ../src/protocols/msn/msn.c:1908 ../src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr "Connector per al protocol MSN"
 
-#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
+#: ../src/protocols/msn/msn.c:1929 ../src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "Servidor d'entrada"
 
-#: src/protocols/msn/msn.c:1929
+#: ../src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr "Usa el mètode HTTP"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1350
+#: ../src/protocols/msn/nexus.c:103 ../src/protocols/msn/servconn.c:127
+#: ../src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr "No s'ha pogut connectar"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no és un nom de grup vàlid"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:523 ../src/protocols/msn/session.c:349
 msgid "Unknown error."
 msgstr "Error desconegut."
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s a %s (%s)"
 
-#: src/protocols/msn/notification.c:496
+#: ../src/protocols/msn/notification.c:493
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
 
-#: src/protocols/msn/notification.c:500
+#: ../src/protocols/msn/notification.c:497
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No s'ha pogut blocar l'usuari %s (%s)"
 
-#: src/protocols/msn/notification.c:504
+#: ../src/protocols/msn/notification.c:501
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No s'ha pogut permetre l'usuari %s (%s)"
 
-# Netscape_4.7->String:MNRC32.DLL
-#: src/protocols/msn/notification.c:512
+#: ../src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No s'ha pogut afegir %s perquè la llista està plena."
 
-#: src/protocols/msn/notification.c:521
+#: ../src/protocols/msn/notification.c:518
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no és un compte de passaport vàlid."
 
-#: src/protocols/msn/notification.c:809
+#: ../src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
 msgstr "No s'ha pogut canviar el nom del grup"
 
-#: src/protocols/msn/notification.c:864
+#: ../src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
 msgstr "No s'ha pogut suprimir el grup"
 
-#: src/protocols/msn/notification.c:1297
+#: ../src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7242,20 +7300,20 @@
 "\n"
 "Després de que el manteniment s'hagi completat, us podreu tornar a connectar."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:129
 msgid "Writing error"
 msgstr "Error en escriure"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:131
 msgid "Reading error"
 msgstr "Error en llegir"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4296
+#: ../src/protocols/msn/servconn.c:133 ../src/protocols/msn/session.c:341
+#: ../src/protocols/oscar/oscar.c:4210
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: src/protocols/msn/servconn.c:136
+#: ../src/protocols/msn/servconn.c:136
 #, c-format
 msgid ""
 "Connection error from %s server (%s):\n"
@@ -7264,179 +7322,170 @@
 "S'ha produït un error de connexió del servidor %s (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no implementa el nostre protocol."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
 msgstr "S'ha produït un error en analitzar HTTP."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+#: ../src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr "Us heu connectat des d'un altre lloc."
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr "Els servidors MSN no seran accessibles temporalment."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:339
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No s'ha pogut autenticar: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:344
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "La llista d'amics MSN està temporalment no disponible. Espereu i proveu-ho "
 "més tard."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:365 ../src/protocols/msn/session.c:367
 msgid "Handshaking"
-msgstr "S'stà comprovant la conformitat de connexió"
-
-#: src/protocols/msn/session.c:364
+msgstr "S'està comprovant la conformitat de connexió"
+
+#: ../src/protocols/msn/session.c:366
 msgid "Transferring"
 msgstr "S'està transferint"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:368
 msgid "Starting authentication"
 msgstr "S'està iniciant l'autenticació"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:369
 msgid "Getting cookie"
 msgstr "S'està obtenint la galeta"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:371
 msgid "Sending cookie"
 msgstr "S'està enviant la galeta"
 
-#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+#: ../src/protocols/msn/session.c:372 ../src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
-msgstr "S'está recuperant la llista d'amics"
-
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Lluny de l'ordinador"
-
-#: src/protocols/msn/switchboard.c:405
+msgstr "S'està recuperant la llista d'amics"
+
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "És possible que no s'hagi pogut enviar el missatge perquè el temps ha "
 "expirat:"
 
-#: src/protocols/msn/switchboard.c:413
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No s'ha pogut enviar el missatatge, no està permès mentre esteu invisible:"
 
-#: src/protocols/msn/switchboard.c:417
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "El missatge no s'ha pogut enviar perquè l'usuari està fora de línia:"
 
-#: src/protocols/msn/switchboard.c:421
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error en la connexió:"
 
-#: src/protocols/msn/switchboard.c:425
+#: ../src/protocols/msn/switchboard.c:421
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error en la "
 "centraleta:"
 
-#: src/protocols/msn/switchboard.c:433
+#: ../src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut:"
 
-#: src/protocols/msn/switchboard.c:689
+#: ../src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr "La conversa ha esdevingut inactiva i el temps ha expirat."
+
+#: ../src/protocols/msn/switchboard.c:697
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s ha tancat la finestra de conversa."
 
-#: src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:87
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'usuari %s (%s) vol afegir %s a la seva llista d'amics"
 
-#: src/protocols/msn/userlist.c:276
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+#: ../src/protocols/msn/userlist.c:96
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "L'usuari %s vol afegir %s a la seva llista d'amics."
 
-#: src/protocols/msn/userlist.c:340
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:655
-#, fuzzy, c-format
+#: ../src/protocols/msn/userlist.c:627
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "No s'ha pogut llegir el fitxer %s."
-
-#: src/protocols/msn/userlist.c:657
-#, fuzzy
+msgstr "No s'ha pogut afegir «%s»."
+
+#: ../src/protocols/msn/userlist.c:629
 msgid "The screen name specified is invalid."
-msgstr "La clau SecurID que heu entrat no és vàlida."
-
-#: src/protocols/napster/napster.c:260
+msgstr "El nom d'usuari especificat no és vàlid."
+
+#: ../src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "No s'ha pogut llegir la capçalera del servidor"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "No s'ha pogut llegir el missatge del servidor: %s. L'ordre és %hd, la "
 "longitud és %hd."
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "Error desconegut."
-
-#: src/protocols/napster/napster.c:339
+#: ../src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "usuaris: %s, fitxers: %s, mida: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "No s'ha pogut afegir \"%s\" a la vostra llista Napster"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: ../src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "Heu estat desconnectats del servidor."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s ha sol·licitat les vostres dades"
 
+#: ../src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+"Se us ha desconnectat del servidor perquè heu entrat des d'un altre lloc"
+
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:455
+#: ../src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s ha sol·licitat un PING"
 
-#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:554 ../src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -7450,91 +7499,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
+#: ../src/protocols/napster/napster.c:652
+#: ../src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "Connector per al protocol Napster"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "No s'han passat tots els paràmetres requerits"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "No s'ha pogut escriure a la xarxa"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "No s'ha pogut llegir de la xarxa"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "S'ha produït un error en comunicar amb el servidor"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "No s'ha trobat la conferència"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "La conferència no existeix."
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Ja existeix una carpeta amb aquest nom"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "No està implementat"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "La contrasenya ha caducat"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "La contrasenya no és vàlida"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "No s'ha trobat l'usuari"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "S'ha inhabilitat el compte"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "El servidor no ha pogut accedir al directori"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "El vostre administrador del sistema ha inhabilitat aquesta operació"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no està disponible, proveu-ho més tard"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "No es pot afegir un contacte a la mateixa carpeta dues vegades"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "No es pot afegir a un mateix"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "L'arxiu mestre està desconfigurat"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "El nom d'usuari o la contrasenya no són vàlides"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu entrat"
 
-#: 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"
@@ -7542,31 +7592,31 @@
 "S'ha inhabilitat el vostre compte perquè s'han entrat massa contrasenyes "
 "incorrectes"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "No podeu afegir la mateixa persona a una conversa dues vegades"
 
-#: 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 "Heu entrat el màxim nombre de contactes permesos"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "El nom d'usuari que heu entrat no és vàlid"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "S'ha produït un error en actualitzar el directori"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "La versió del protocol no és compatible"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "L'usuari us ha blocat"
 
-#: 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"
@@ -7574,57 +7624,57 @@
 "Aquesta versió d'avaluació no permet que entrin més de deu usuaris a la "
 "vegada"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "L'usuari està fora de línia o bé esteu blocat"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconegut: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Ha fallat l'entrada (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'han pogut obtenir detalls de l'usuari "
 "(%s)."
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "No s'ha pogut afegir %s a la vostra llista d'amics (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No s'ha pogut enviar el missatge (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:476 ../src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No s'ha pogut convidar l'usuari (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència (%"
 "s)."
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'ha pogut crear la conferència (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7633,7 +7683,7 @@
 "No s'ha pogut moure l'usuari %s a la carpeta %s a la part del servidor. S'ha "
 "produït un error en crear la carpeta (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7642,71 +7692,71 @@
 "No s'ha pogut afegir %s a la vostra llista d'amics. S'ha produït un error en "
 "crear la carpeta a la part del servidor (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No s'han pogut obtenir detalls de l'usuari %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:734 ../src/protocols/novell/novell.c:880
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No s'ha pogut afegir l'usuari a la llista de privadesa (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:781
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de denegats (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:834
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de permesos (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:902
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
+#: ../src/protocols/novell/novell.c:925 ../src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "No s'han pogut canviar els paràmetres de privadesa en la part del servidor (%"
 "s)."
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No s'ha pogut crear la conferència (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
+#: ../src/protocols/novell/novell.c:1108 ../src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 "S'ha produït un error en la comunicació amb el servidor. S'està tancant la "
 "connexió."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "Número de telèfon"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1447
 msgid "Department"
-msgstr "Department"
-
-#: src/protocols/novell/novell.c:1458
+msgstr "Departament"
+
+#: ../src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr "Títol personal"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr "Oficina de correu electrònic"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
-#: src/protocols/oscar/oscar.c:5323
+#: ../src/protocols/novell/novell.c:1455 ../src/protocols/oscar/oscar.c:5205
+#: ../src/protocols/oscar/oscar.c:5212
 msgid "Email Address"
 msgstr "Adreça de correu"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "ID de l'usuari"
 
@@ -7717,46 +7767,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "Nom"
 
-#: src/protocols/novell/novell.c:1515
+#: ../src/protocols/novell/novell.c:1506
 msgid "User Properties"
 msgstr "Propietat de l'usuari"
 
-#: src/protocols/novell/novell.c:1619
+#: ../src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferència GroupWise %d"
 
-#: src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "No s'ha pogut fer una connexió SSL al servidor."
 
-#: src/protocols/novell/novell.c:1674
+#: ../src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "S'ha produït un error en processar una incidència o resposta (%s)."
 
-#: src/protocols/novell/novell.c:1708
+#: ../src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-#: src/protocols/novell/novell.c:1723
+#: ../src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
-#: src/protocols/novell/novell.c:1858
+#: ../src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "S'ha convidat a %s a aquesta conversa."
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr "Invitació a la conversa"
 
-#: src/protocols/novell/novell.c:1887
+#: ../src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7767,17 +7817,17 @@
 "\n"
 "Ha enviat: %s"
 
-#: src/protocols/novell/novell.c:1889
+#: ../src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-#: src/protocols/novell/novell.c:1996
+#: ../src/protocols/novell/novell.c:1985
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Se us ha desconnectat perquè us heu entrat a través d'una altra estació de "
 "treball."
 
-#: src/protocols/novell/novell.c:2052
+#: ../src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7789,7 +7839,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2150
+#: ../src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7797,16 +7847,24 @@
 "No s'ha pogut connectar al servidor. Entreu l'adreça del servidor al que us "
 "vulgueu connectar."
 
-#: src/protocols/novell/novell.c:2172
+#: ../src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "Error. El suport per a SLL no està instal·lat."
 
-#: src/protocols/novell/novell.c:2476
+#: ../src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat aquesta conferència. No s'hi poden enviar més missatges."
 
-#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
-#: src/protocols/yahoo/yahoo.c:2808
+#: ../src/protocols/novell/novell.c:2809 ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/oscar/oscar.c:6809 ../src/protocols/yahoo/yahoo.c:2782
+msgid "Offline"
+msgstr "Fora de línia"
+
+#: ../src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "Missatge"
+
+#: ../src/protocols/novell/novell.c:2919 ../src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr "Simula estar fora de línia"
 
@@ -7820,115 +7878,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
+#: ../src/protocols/novell/novell.c:3468 ../src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Connector per al protocol Novel GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3559
+#: ../src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: src/protocols/novell/novell.c:3563
+#: ../src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#: src/protocols/oscar/oscar.c:196
+#: ../src/protocols/oscar/oscar.c:189
 msgid "Invalid error"
 msgstr "Error invàlid"
 
-#: src/protocols/oscar/oscar.c:197
+#: ../src/protocols/oscar/oscar.c:190
 msgid "Invalid SNAC"
 msgstr "SNAC invàlid"
 
-#: src/protocols/oscar/oscar.c:198
+#: ../src/protocols/oscar/oscar.c:191
 msgid "Rate to host"
 msgstr "Ràtio a l'ordinador"
 
-#: src/protocols/oscar/oscar.c:199
+#: ../src/protocols/oscar/oscar.c:192
 msgid "Rate to client"
 msgstr "Ràtio al client"
 
-#: src/protocols/oscar/oscar.c:201
+#: ../src/protocols/oscar/oscar.c:194
 msgid "Service unavailable"
 msgstr "Servei no disponible"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:195
 msgid "Service not defined"
 msgstr "Servei no definit"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:196
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolet"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:197
 msgid "Not supported by host"
-msgstr "No està suportat pel servidor"
-
-#: src/protocols/oscar/oscar.c:205
+msgstr "El servidor no ho permet"
+
+#: ../src/protocols/oscar/oscar.c:198
 msgid "Not supported by client"
-msgstr "No està suportat pel client"
-
-#: src/protocols/oscar/oscar.c:206
+msgstr "El client no ho permet"
+
+#: ../src/protocols/oscar/oscar.c:199
 msgid "Refused by client"
 msgstr "Rebutjat pel client"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:200
 msgid "Reply too big"
 msgstr "Resposta massa gran"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:201
 msgid "Responses lost"
 msgstr "S'han perdut respostes"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:202
 msgid "Request denied"
 msgstr "Petició denegada"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Busted SNAC payload"
 msgstr "Càrrega SNAC malmesa"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Insufficient rights"
 msgstr "Drets insuficients"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:205
 msgid "In local permit/deny"
 msgstr "En la llista de permès/denegat local"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Too evil (sender)"
 msgstr "Massa malvat (remitent)"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:207
 msgid "Too evil (receiver)"
 msgstr "Massa malvat (receptor)"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:208
 msgid "User temporarily unavailable"
 msgstr "Usuari no disponible temporalment"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:209
 msgid "No match"
 msgstr "Cap coincidència"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:210
 msgid "List overflow"
 msgstr "Sobreeiximent de la llista"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Request ambiguous"
 msgstr "Petició ambigua"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Queue full"
 msgstr "Cua plena"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estigui a AOL"
 
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
+#: ../src/protocols/oscar/oscar.c:409 ../src/protocols/oscar/oscar.c:492
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7936,159 +7994,158 @@
 "(S'ha produït un error en rebre aquest missatge. És molt possible que l'amic "
 "amb qui parleu tingui un client defectuós)"
 
-#: src/protocols/oscar/oscar.c:607
+#: ../src/protocols/oscar/oscar.c:594
 msgid "Voice"
 msgstr "Veu"
 
-#: src/protocols/oscar/oscar.c:610
+#: ../src/protocols/oscar/oscar.c:597
 msgid "AIM Direct IM"
 msgstr "MI AIM directes"
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:600 ../src/protocols/silc/silc.c:654
+#: ../src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Xat"
 
-#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
+#: ../src/protocols/oscar/oscar.c:603 ../src/protocols/oscar/oscar.c:7111
 msgid "Get File"
-msgstr "Obtingues fitxer"
-
-#: src/protocols/oscar/oscar.c:623
+msgstr "Aconsegueix el fitxer"
+
+#: ../src/protocols/oscar/oscar.c:610
 msgid "Games"
 msgstr "Jocs"
 
-#: src/protocols/oscar/oscar.c:626
+#: ../src/protocols/oscar/oscar.c:613
 msgid "Add-Ins"
 msgstr "Afegits"
 
-#: src/protocols/oscar/oscar.c:629
+#: ../src/protocols/oscar/oscar.c:616
 msgid "Send Buddy List"
 msgstr "Envia la llista d'amics"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:619
 msgid "ICQ Direct Connect"
 msgstr "Connexió directa a ICQ"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:622
 msgid "AP User"
 msgstr "Usuari AP"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:625
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:631
 msgid "ICQ Server Relay"
 msgstr "Servidor repetidor d'ICQ"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:634
 msgid "Old ICQ UTF8"
 msgstr "Antic ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:637
 msgid "Trillian Encryption"
 msgstr "Xifrat Trillian"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:640
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:643
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:646
 msgid "Security Enabled"
 msgstr "Seguretat habilitada"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:649
 msgid "Video Chat"
 msgstr "Xat de vídeo"
 
-#: src/protocols/oscar/oscar.c:666
+#: ../src/protocols/oscar/oscar.c:653
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:669
+#: ../src/protocols/oscar/oscar.c:656
 msgid "Live Video"
 msgstr "Vídeo en directe"
 
-#: src/protocols/oscar/oscar.c:672
+#: ../src/protocols/oscar/oscar.c:659
 msgid "Camera"
 msgstr "Càmera"
 
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
+#: ../src/protocols/oscar/oscar.c:677 ../src/protocols/oscar/oscar.c:5814
+#: ../src/protocols/oscar/oscar.c:7003
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
-#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
+#: ../src/protocols/oscar/oscar.c:681 ../src/protocols/oscar/oscar.c:5808
+#: ../src/protocols/oscar/oscar.c:7001
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
+#: ../src/protocols/oscar/oscar.c:683 ../src/protocols/oscar/oscar.c:5811
+#: ../src/protocols/oscar/oscar.c:7002
 msgid "Occupied"
 msgstr "Ocupat"
 
-#: src/protocols/oscar/oscar.c:700
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Web Aware"
 msgstr "Conscient de la web"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
-msgid "Warning Level"
-msgstr "Nivell d'avís"
-
-#: src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr "Capacitats"
 
-#: src/protocols/oscar/oscar.c:794
+#: ../src/protocols/oscar/oscar.c:764
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#: src/protocols/oscar/oscar.c:951
+#: ../src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "S'ha tancat la conversa d'IM amb %s"
 
-#: src/protocols/oscar/oscar.c:953
+#: ../src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Ha fallat la conversa directa de MI amb %s"
 
-#: src/protocols/oscar/oscar.c:961
+#: ../src/protocols/oscar/oscar.c:908
 msgid "Direct Connect failed"
 msgstr "Ha fallat la connexió directa"
 
-#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
+#: ../src/protocols/oscar/oscar.c:985 ../src/protocols/oscar/oscar.c:1116
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "S'ha establert una connexió directa de MI amb %s"
 
-#: src/protocols/oscar/oscar.c:1119
+#: ../src/protocols/oscar/oscar.c:1066
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "S'està intentant connectar amb %s a %s:%hu per a MI directa."
 
-#: src/protocols/oscar/oscar.c:1545
+#: ../src/protocols/oscar/oscar.c:1486
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "S'està demanant a %s que es connecti a vostè a %s:%hu per a MI directa."
 
-#: src/protocols/oscar/oscar.c:1550
+#: ../src/protocols/oscar/oscar.c:1491
 msgid "Unable to open Direct IM"
-msgstr "No s'ha pogut obrir la communicació de MI directa"
-
-#: src/protocols/oscar/oscar.c:1585
+msgstr "No s'ha pogut obrir la comunicació de MI directa"
+
+#: ../src/protocols/oscar/oscar.c:1526
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Heu escollit obrir una connexió directa de MI amb %s."
 
-#: src/protocols/oscar/oscar.c:1589
+#: ../src/protocols/oscar/oscar.c:1530
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8096,24 +8153,24 @@
 "Atès que això revela la vostra adreça IP, es podria considerar com un risc "
 "de privadesa. Voleu continuar?"
 
-#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
+#: ../src/protocols/oscar/oscar.c:1534 ../src/protocols/oscar/oscar.c:3644
 msgid "Connect"
 msgstr "Connecta"
 
-#: src/protocols/oscar/oscar.c:1657
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Heu perdut la connexió a la sala de xat %s."
-
-#: src/protocols/oscar/oscar.c:1680
+#: ../src/protocols/oscar/oscar.c:1601 ../src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Se us ha desconnectat de la conversa %s."
+
+#: ../src/protocols/oscar/oscar.c:1620
 msgid "Chat is currently unavailable"
 msgstr "El xat no està actualment disponible"
 
-#: src/protocols/oscar/oscar.c:1749
+#: ../src/protocols/oscar/oscar.c:1701
 msgid "Screen name sent"
 msgstr "S'ha enviat el nom d'usuari"
 
-#: src/protocols/oscar/oscar.c:1773
+#: ../src/protocols/oscar/oscar.c:1715
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8124,52 +8181,53 @@
 "no és vàlid. Els noms d'usuari han de començar amb una lletra i contenir "
 "només lletres, nombres o espais, o només nombres."
 
-#: src/protocols/oscar/oscar.c:1802
+#: ../src/protocols/oscar/oscar.c:1743
 msgid "Unable to login to AIM"
 msgstr "No s'ha pogut connectar a l'AIM"
 
-#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
+#: ../src/protocols/oscar/oscar.c:1845 ../src/protocols/oscar/oscar.c:2366
 msgid "Could Not Connect"
 msgstr "No s'ha pogut connectar"
 
-#: src/protocols/oscar/oscar.c:1914
+#: ../src/protocols/oscar/oscar.c:1853
 msgid "Connection established, cookie sent"
 msgstr "Connexió establerta, s'està enviant el secret"
 
-#: src/protocols/oscar/oscar.c:2027
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:1964
+#, c-format
 msgid "Transfer of file %s timed out."
-msgstr "S'ha completat la transferència del fitxer %s"
-
-#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:195
+msgstr "S'ha excedit el temps d'espera de la transferència del fitxer %s."
+
+#: ../src/protocols/oscar/oscar.c:2048
+#: ../src/protocols/yahoo/yahoo_filexfer.c:177
+#: ../src/protocols/yahoo/yahoo_filexfer.c:186
+#: ../src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
-#: src/protocols/oscar/oscar.c:2111
+#: ../src/protocols/oscar/oscar.c:2053
 msgid "Unable to create new connection."
 msgstr "No s'ha pogut crear una nova connexió."
 
-#: src/protocols/oscar/oscar.c:2190
+#: ../src/protocols/oscar/oscar.c:2125
 msgid "Unable to establish listener socket."
 msgstr "No s'ha pogut establir un sòcol on escoltar."
 
-#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2250 ../src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "El sobrenom o la contrasenya són incorrectes"
 
-#: src/protocols/oscar/oscar.c:2320
+#: ../src/protocols/oscar/oscar.c:2255
 msgid "Your account is currently suspended."
 msgstr "El vostre compte està actualment suspès."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2324
+#: ../src/protocols/oscar/oscar.c:2259
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
-#: src/protocols/oscar/oscar.c:2329
+#: ../src/protocols/oscar/oscar.c:2264
 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."
@@ -8178,33 +8236,33 @@
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-#: src/protocols/oscar/oscar.c:2334
+#: ../src/protocols/oscar/oscar.c:2269
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %s"
 
-#: src/protocols/oscar/oscar.c:2365
+#: ../src/protocols/oscar/oscar.c:2301
 msgid "Internal Error"
 msgstr "Error intern"
 
-#: src/protocols/oscar/oscar.c:2435
+#: ../src/protocols/oscar/oscar.c:2373
 msgid "Received authorization"
 msgstr "S'ha rebut l'autorització"
 
-#: src/protocols/oscar/oscar.c:2459
+#: ../src/protocols/oscar/oscar.c:2397
 msgid "The SecurID key entered is invalid."
 msgstr "La clau SecurID que heu entrat no és vàlida."
 
-#: src/protocols/oscar/oscar.c:2473
+#: ../src/protocols/oscar/oscar.c:2411
 msgid "Enter SecurID"
 msgstr "Entreu el SecureID"
 
-#: src/protocols/oscar/oscar.c:2474
+#: ../src/protocols/oscar/oscar.c:2412
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Entreu el nombre de 6 dígits de la pantalla digital."
 
-#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
-#: src/protocols/oscar/oscar.c:2633
+#: ../src/protocols/oscar/oscar.c:2452 ../src/protocols/oscar/oscar.c:2482
+#: ../src/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8213,24 +8271,24 @@
 "Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu usar TOC fins que "
 "això es resolgui. Comproveu si hi ha actualitzacions a %s."
 
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
+#: ../src/protocols/oscar/oscar.c:2455 ../src/protocols/oscar/oscar.c:2485
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "El Gaim no ha pogut obtenir un hash d'AIM d'entrada vàlid."
 
-#: src/protocols/oscar/oscar.c:2636
+#: ../src/protocols/oscar/oscar.c:2574
 msgid "Gaim was unable to get a valid login hash."
 msgstr "El Gaim no ha pogut obtenir un hash d'entrada vàlid."
 
-#: src/protocols/oscar/oscar.c:2667
+#: ../src/protocols/oscar/oscar.c:2606
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
-#: src/protocols/oscar/oscar.c:3722
+#: ../src/protocols/oscar/oscar.c:3636
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demana connectar-se directament a %s"
 
-#: src/protocols/oscar/oscar.c:3725
+#: ../src/protocols/oscar/oscar.c:3639
 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 "
@@ -8240,19 +8298,19 @@
 "necessari per poder enviar imatges instantànies. Atès que es revelarà la "
 "vostra adreça IP, això es pot considerar un risc de privadesa."
 
-#: src/protocols/oscar/oscar.c:3764
+#: ../src/protocols/oscar/oscar.c:3677
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoritzeu-me perquè pugui afegir-vos a la meva llista d'amics."
 
-#: src/protocols/oscar/oscar.c:3772
+#: ../src/protocols/oscar/oscar.c:3685
 msgid "Authorization Request Message:"
 msgstr "Missatge de petició d'autorització:"
 
-#: src/protocols/oscar/oscar.c:3773
+#: ../src/protocols/oscar/oscar.c:3686
 msgid "Please authorize me!"
 msgstr "Autoritzeu-me, si us plau."
 
-#: src/protocols/oscar/oscar.c:3803
+#: ../src/protocols/oscar/oscar.c:3716
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8261,34 +8319,35 @@
 "L'usuari %s demana una autorització abans de ser afegit a una llista "
 "d'amics. Voleu enviar una sol·licitud d'autorització?"
 
-#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3810
+#: ../src/protocols/oscar/oscar.c:3721 ../src/protocols/oscar/oscar.c:3723
 msgid "Request Authorization"
 msgstr "Sol·licitud d'autorització"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
-#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
+#: ../src/protocols/oscar/oscar.c:3771 ../src/protocols/oscar/oscar.c:3773
+#: ../src/protocols/oscar/oscar.c:3780 ../src/protocols/oscar/oscar.c:3877
+#: ../src/protocols/oscar/oscar.c:3897 ../src/protocols/oscar/oscar.c:6444
+#: ../src/protocols/oscar/oscar.c:6490
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
 
-#: src/protocols/oscar/oscar.c:3853
+#: ../src/protocols/oscar/oscar.c:3779
 msgid "Authorization Denied Message:"
 msgstr "Missatge de denegació de l'autorització:"
 
-#: src/protocols/oscar/oscar.c:3961
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: ../src/protocols/oscar/oscar.c:3877
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "L'usuari %u vol afegir-vos a la seva llista d'amics pels següents motius:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
+#: ../src/protocols/oscar/oscar.c:3885 ../src/protocols/oscar/oscar.c:6450
 msgid "Authorization Request"
 msgstr "Sol·licitud d'autorització"
 
-#: src/protocols/oscar/oscar.c:3983
+#: ../src/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8299,17 +8358,17 @@
 "d'amics pel següent motiu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3984
+#: ../src/protocols/oscar/oscar.c:3898
 msgid "ICQ authorization denied."
 msgstr "S'ha denegat l'autorització ICQ."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3991
+#: ../src/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "L'usuari %u us ha permès afegir-lo a la vostra llista d'amics."
 
-#: src/protocols/oscar/oscar.c:3999
+#: ../src/protocols/oscar/oscar.c:3913
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8322,7 +8381,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4007
+#: ../src/protocols/oscar/oscar.c:3921
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8335,7 +8394,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4015
+#: ../src/protocols/oscar/oscar.c:3929
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8348,34 +8407,34 @@
 "Missatge:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4036
+#: ../src/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'usuari %u d'ICQ us ha enviat un amic: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4042
+#: ../src/protocols/oscar/oscar.c:3956
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voleu afegir aquest amic a la vostra llista d'amics?"
 
-#: src/protocols/oscar/oscar.c:4046
+#: ../src/protocols/oscar/oscar.c:3960
 msgid "Decline"
 msgstr "Rebutja"
 
-#: src/protocols/oscar/oscar.c:4130
+#: ../src/protocols/oscar/oscar.c:4044
 #, 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] "S'ha perdut %hu missatge de %s perquè era invàlid."
 msgstr[1] "S'ha perdut %hu missatges de %s perquè eren invàlids."
 
-#: src/protocols/oscar/oscar.c:4139
+#: ../src/protocols/oscar/oscar.c:4053
 #, 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] "S'ha perdut %hu missatge de %s perquè era massa llarg."
 msgstr[1] "S'ha perdut %hu missatges de %s perquè eren massa llargs."
 
-#: src/protocols/oscar/oscar.c:4148
+#: ../src/protocols/oscar/oscar.c:4062
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8384,7 +8443,7 @@
 msgstr[0] "S'ha perdut %hu missatge de %s perquè era invàlid."
 msgstr[1] "S'han perdut %hu missatges de %s perquè eren invàlids."
 
-#: src/protocols/oscar/oscar.c:4157
+#: ../src/protocols/oscar/oscar.c:4071
 #, 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."
@@ -8392,71 +8451,70 @@
 msgstr[1] ""
 "S'han perdut %hu missatges de %s perquè ell/ella ere massa dolent/a."
 
-#: src/protocols/oscar/oscar.c:4166
+#: ../src/protocols/oscar/oscar.c:4080
 #, 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] "S'ha perdut %hu missatge de %s perquè sou massa dolents."
 msgstr[1] "S'han perdut %hu missatges de %s perquè sou massa dolents."
 
-#: src/protocols/oscar/oscar.c:4175
+#: ../src/protocols/oscar/oscar.c:4089
 #, 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] "S'ha perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "S'han perdut %hu missatges de %s per motius desconeguts."
 
-#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: ../src/protocols/oscar/oscar.c:4143 ../src/protocols/oscar/oscar.c:4375
 #, c-format
 msgid "Info for %s"
 msgstr "Informació quant a %s"
 
-#: src/protocols/oscar/oscar.c:4295
+#: ../src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Error SNAC: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4332
+#: ../src/protocols/oscar/oscar.c:4245
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
-#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
+#: ../src/protocols/oscar/oscar.c:4245 ../src/protocols/oscar/oscar.c:4250
+#: ../src/protocols/oscar/oscar.c:4308 ../src/protocols/oscar/oscar.c:4312
 msgid "Unknown reason."
 msgstr "Motiu desconegut."
 
-#: src/protocols/oscar/oscar.c:4335
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "No s'ha pogut enviar el missatge a %s:"
-
-#: src/protocols/oscar/oscar.c:4395
+#: ../src/protocols/oscar/oscar.c:4308
 #, c-format
 msgid "User information not available: %s"
 msgstr "La informació de l'usuari no està disponible: %s"
 
-#: src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:4311
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "La informació de %s no està disponible:"
 
-#: src/protocols/oscar/oscar.c:4425
+#: ../src/protocols/oscar/oscar.c:4333
+msgid "Warning Level"
+msgstr "Nivell d'avís"
+
+#: ../src/protocols/oscar/oscar.c:4337
 msgid "Online Since"
 msgstr "En línia des de"
 
-#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
+#: ../src/protocols/oscar/oscar.c:4342
+#: ../src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Member Since"
 msgstr "Membre des de"
 
-#: src/protocols/oscar/oscar.c:4514
+#: ../src/protocols/oscar/oscar.c:4426
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4700
+#: ../src/protocols/oscar/oscar.c:4612
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8464,11 +8522,11 @@
 "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
 "invàlids.]"
 
-#: src/protocols/oscar/oscar.c:4925
+#: ../src/protocols/oscar/oscar.c:4837
 msgid "Rate limiting error."
 msgstr "Error de limitació de velocitat."
 
-#: src/protocols/oscar/oscar.c:4926
+#: ../src/protocols/oscar/oscar.c:4838
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8476,108 +8534,117 @@
 "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
 "per sobre del límit. Espereu 10 segons i torneu-ho a provar."
 
-#: src/protocols/oscar/oscar.c:4997
+#: ../src/protocols/oscar/oscar.c:4901
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+"Se us ha desconnectat perquè us heu connectat amb el mateix nom des d'un "
+"altre lloc."
+
+#: ../src/protocols/oscar/oscar.c:4903
 msgid "You have been signed off for an unknown reason."
 msgstr "Se us ha desconnectat per motius desconeguts."
 
-#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "Se us ha desconnectat de la conversa %s."
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5035
+#: ../src/protocols/oscar/oscar.c:4934
 msgid "Finalizing connection"
 msgstr "S'està finalitzant la connexió"
 
-#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:5217 ../src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
-#: src/protocols/trepia/trepia.c:408
+#: ../src/protocols/oscar/oscar.c:5218
+msgid "Not specified"
+msgstr "No especificat"
+
+#: ../src/protocols/oscar/oscar.c:5219 ../src/protocols/trepia/trepia.c:282
+#: ../src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Dona"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:408
+#: ../src/protocols/oscar/oscar.c:5219 ../src/protocols/trepia/trepia.c:281
+#: ../src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Home"
 
-#: src/protocols/oscar/oscar.c:5346
+#: ../src/protocols/oscar/oscar.c:5235
 msgid "Personal Web Page"
 msgstr "Pàgina web personal"
 
-#: src/protocols/oscar/oscar.c:5350
+#: ../src/protocols/oscar/oscar.c:5239
 msgid "Additional Information"
 msgstr "Informació addicional"
 
-#: src/protocols/oscar/oscar.c:5355
+#: ../src/protocols/oscar/oscar.c:5244
 msgid "Home Address"
 msgstr "Adreça de casa"
 
-#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
+#: ../src/protocols/oscar/oscar.c:5248 ../src/protocols/oscar/oscar.c:5256
 msgid "Zip Code"
 msgstr "Codi postal"
 
-#: src/protocols/oscar/oscar.c:5363
+#: ../src/protocols/oscar/oscar.c:5252
 msgid "Work Address"
 msgstr "Adreça de la feina"
 
-#: src/protocols/oscar/oscar.c:5371
+#: ../src/protocols/oscar/oscar.c:5260
 msgid "Work Information"
 msgstr "Informació de la feina"
 
-#: src/protocols/oscar/oscar.c:5372
+#: ../src/protocols/oscar/oscar.c:5261
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:5373
+#: ../src/protocols/oscar/oscar.c:5262
 msgid "Division"
 msgstr "Divisió"
 
-#: src/protocols/oscar/oscar.c:5374
+#: ../src/protocols/oscar/oscar.c:5263
 msgid "Position"
 msgstr "Posició"
 
-#: src/protocols/oscar/oscar.c:5376
+#: ../src/protocols/oscar/oscar.c:5265
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5275
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informació ICQ de %s"
 
-#: src/protocols/oscar/oscar.c:5435
+#: ../src/protocols/oscar/oscar.c:5324
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5457
+#: ../src/protocols/oscar/oscar.c:5345
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Els següents noms d'usuari estan associats amb %s"
 
-#: src/protocols/oscar/oscar.c:5482
+#: ../src/protocols/oscar/oscar.c:5349
+msgid "Search Results"
+msgstr "Resultats de la cerca"
+
+#: ../src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No s'han obtingut resultats per a l'adreça de correu %s"
 
-#: src/protocols/oscar/oscar.c:5503
+#: ../src/protocols/oscar/oscar.c:5387
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
-#: src/protocols/oscar/oscar.c:5505
+#: ../src/protocols/oscar/oscar.c:5389
 msgid "Account Confirmation Requested"
 msgstr "S'ha sol·licitat la confirmació del compte"
 
-#: src/protocols/oscar/oscar.c:5536
+#: ../src/protocols/oscar/oscar.c:5420
 msgid "Error Changing Account Info"
 msgstr "S'ha produït un error en canviar la informació del compte"
 
-#: src/protocols/oscar/oscar.c:5539
+#: ../src/protocols/oscar/oscar.c:5423
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8586,7 +8653,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat "
 "difereix de l'original."
 
-#: src/protocols/oscar/oscar.c:5542
+#: ../src/protocols/oscar/oscar.c:5426
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8595,7 +8662,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat acaba "
 "en un espai."
 
-#: src/protocols/oscar/oscar.c:5545
+#: ../src/protocols/oscar/oscar.c:5429
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8604,7 +8671,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat és "
 "massa llarg."
 
-#: src/protocols/oscar/oscar.c:5548
+#: ../src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8613,7 +8680,7 @@
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè ja "
 "hi ha una petició pendent per a aquest nom d'usuari."
 
-#: src/protocols/oscar/oscar.c:5551
+#: ../src/protocols/oscar/oscar.c:5435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8622,7 +8689,7 @@
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè "
 "l'adreça donada ja té massa noms d'usuari associats."
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8631,12 +8698,12 @@
 "Error 0x%04x: No s'ha pogut canviar l'adreça de correu perquè l'adreça "
 "indicada no és vàlida."
 
-#: src/protocols/oscar/oscar.c:5557
+#: ../src/protocols/oscar/oscar.c:5441
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: error desconegut."
 
-#: src/protocols/oscar/oscar.c:5567
+#: ../src/protocols/oscar/oscar.c:5451
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8645,27 +8712,27 @@
 "El vostre nom d'usuari té aquest format:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
+#: ../src/protocols/oscar/oscar.c:5452 ../src/protocols/oscar/oscar.c:5459
 msgid "Account Info"
 msgstr "Informació del compte"
 
-#: src/protocols/oscar/oscar.c:5573
+#: ../src/protocols/oscar/oscar.c:5457
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adreça de correu per a %s és %s"
 
-#: src/protocols/oscar/oscar.c:5640
+#: ../src/protocols/oscar/oscar.c:5522
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No s'ha enviat la imatge de MI. Heu d'estar directament connectat per poder "
 "enviar imatges de MI."
 
-#: src/protocols/oscar/oscar.c:5780
+#: ../src/protocols/oscar/oscar.c:5663
 msgid "Unable to set AIM profile."
 msgstr "No s'ha pogut establir el perfil d'AIM."
 
-#: src/protocols/oscar/oscar.c:5781
+#: ../src/protocols/oscar/oscar.c:5664
 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 "
@@ -8675,7 +8742,7 @@
 "procés de connexió. El vostre perfil segueix sense estar establert; intenteu "
 "establir-lo de nou quan el procés de connexió hagi finalitzat."
 
-#: src/protocols/oscar/oscar.c:5808
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8690,15 +8757,19 @@
 "S'ha excedit el límit màxim per la mida del perfil de %d octets. El Gaim "
 "l'ha retallat."
 
-#: src/protocols/oscar/oscar.c:5813
+#: ../src/protocols/oscar/oscar.c:5696
 msgid "Profile too long."
 msgstr "Perfil massa llarg."
 
-#: src/protocols/oscar/oscar.c:5843
+#: ../src/protocols/oscar/oscar.c:5712 ../src/protocols/oscar/oscar.c:7008
+msgid "Visible"
+msgstr "Visible"
+
+#: ../src/protocols/oscar/oscar.c:5730
 msgid "Unable to set AIM away message."
 msgstr "No s'ha pogut posar el missatge s'absència per a AIM."
 
-#: src/protocols/oscar/oscar.c:5844
+#: ../src/protocols/oscar/oscar.c:5731
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8708,7 +8779,7 @@
 "amb el procés de connexió. El vostre estat continua essent \"present\"; "
 "intenteu canviar-lo un cop hagi finalitzat el procés de connexió."
 
-#: src/protocols/oscar/oscar.c:5891
+#: ../src/protocols/oscar/oscar.c:5771
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8723,11 +8794,11 @@
 "S'ha superat el límit de %d octets per al missatge d'absència. El Gaim l'ha "
 "retallat."
 
-#: src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5776
 msgid "Away message too long."
 msgstr "El missatge d'absència és massa llarg."
 
-#: src/protocols/oscar/oscar.c:5994
+#: ../src/protocols/oscar/oscar.c:5853
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8738,16 +8809,16 @@
 "d'usuari han de començar amb una lletra i contenir lletres, nombres i "
 "espais, o només nombres."
 
-#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6408
+#: ../src/protocols/oscar/oscar.c:5855 ../src/protocols/oscar/oscar.c:6310
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Unable To Add"
 msgstr "No s'ha pogut afegir"
 
-#: src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/oscar/oscar.c:6022
 msgid "Unable To Retrieve Buddy List"
 msgstr "No s'ha pogut obtenir la llista d'amics"
 
-#: src/protocols/oscar/oscar.c:6101
+#: ../src/protocols/oscar/oscar.c:6023
 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 "
@@ -8757,13 +8828,13 @@
 "llista d'amics no s'ha perdut, i probablement tornarà a estar disponible "
 "d'aquí a poques hores."
 
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
-#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
-#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
+#: ../src/protocols/oscar/oscar.c:6205 ../src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:6211 ../src/protocols/oscar/oscar.c:6368
+#: ../src/protocols/oscar/oscar.c:6369 ../src/protocols/oscar/oscar.c:6374
 msgid "Orphans"
 msgstr "Orfes"
 
-#: src/protocols/oscar/oscar.c:6392
+#: ../src/protocols/oscar/oscar.c:6308
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8772,11 +8843,11 @@
 "No s'ha pogut afegir l'amic %s perque hi ha massa entrades a la llista "
 "d'amics. Suprimiu-ne algun i torneu-ho a intentar."
 
-#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
+#: ../src/protocols/oscar/oscar.c:6308 ../src/protocols/oscar/oscar.c:6322
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: src/protocols/oscar/oscar.c:6406
+#: ../src/protocols/oscar/oscar.c:6322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8784,9 +8855,9 @@
 "buddy list."
 msgstr ""
 "Per motius desconeguts no s'ha pogut afegir l'amic %s. El motiu més comú és "
-"que ja heu ocupat el número màxim d'amics a la llista d'amics."
-
-#: src/protocols/oscar/oscar.c:6489
+"que ja heu ocupat el nombre màxim d'amics a la llista d'amics."
+
+#: ../src/protocols/oscar/oscar.c:6405
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8795,31 +8866,31 @@
 "L'usuari %s us ha donat permís per afegir-vos a la seva llista d'amics. "
 "Voleu afegir-lo a la vostra?"
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6411
 msgid "Authorization Given"
 msgstr "S'ha donat l'autorització"
 
-#: src/protocols/oscar/oscar.c:6538
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: ../src/protocols/oscar/oscar.c:6444
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "L'usuari %s vol afegir-vos a la seva llista d'amics pls següents motius:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6583
+#: ../src/protocols/oscar/oscar.c:6486
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "L'usuari %s us ha permès afegir-lo a la vostra llista d'amics."
 
-#: src/protocols/oscar/oscar.c:6584
+#: ../src/protocols/oscar/oscar.c:6487
 msgid "Authorization Granted"
 msgstr "S'ha concedit l'autorització"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6587
+#: ../src/protocols/oscar/oscar.c:6490
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8830,95 +8901,79 @@
 "pels següents motius:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6588
+#: ../src/protocols/oscar/oscar.c:6491
 msgid "Authorization Denied"
 msgstr "S'ha denegat l'autorització"
 
-#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:6528 ../src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr "Int_ercanvi:"
 
-#: src/protocols/oscar/oscar.c:6664
+#: ../src/protocols/oscar/oscar.c:6566
 msgid "Invalid chat name specified."
 msgstr "S'ha especificat un nom de xat invàlid."
 
-#: src/protocols/oscar/oscar.c:6731
+#: ../src/protocols/oscar/oscar.c:6655
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "La vostra imatge MI no s'ha enviat. No podeu enviar imatges MI en xats AIM."
 
-#: src/protocols/oscar/oscar.c:6866
+#: ../src/protocols/oscar/oscar.c:6781
 msgid "Away Message"
 msgstr "Missatge d'absència"
 
-#: src/protocols/oscar/oscar.c:7153
+#: ../src/protocols/oscar/oscar.c:7067
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
 
-#: src/protocols/oscar/oscar.c:7154
+#: ../src/protocols/oscar/oscar.c:7068
 msgid "Buddy Comment:"
 msgstr "Comentari sobre l'amic:"
 
-#: src/protocols/oscar/oscar.c:7173
+#: ../src/protocols/oscar/oscar.c:7087
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#: src/protocols/oscar/oscar.c:7179
+#: ../src/protocols/oscar/oscar.c:7093
 msgid "Get Status Msg"
-msgstr "Obtingues el missatge d'estat"
-
-#: src/protocols/oscar/oscar.c:7191
+msgstr "Aconsegueix el missatge d'estat"
+
+#: ../src/protocols/oscar/oscar.c:7105
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: src/protocols/oscar/oscar.c:7208
+#: ../src/protocols/oscar/oscar.c:7122
 msgid "Re-request Authorization"
 msgstr "Torna a demanar l'autorització"
 
-#: src/protocols/oscar/oscar.c:7268
-msgid "Require authorization"
-msgstr "Requereix autorització"
-
-#: src/protocols/oscar/oscar.c:7271
-msgid "Hide IP address"
-msgstr "Ocula l'adreça IP"
-
-#: src/protocols/oscar/oscar.c:7274
-msgid "Web aware"
-msgstr "Conscient de la web"
-
-#: src/protocols/oscar/oscar.c:7279
-msgid "ICQ Privacy Options"
-msgstr "Opcions de privadesa de ICQ"
-
-#: src/protocols/oscar/oscar.c:7296
+#: ../src/protocols/oscar/oscar.c:7152
 msgid "The new formatting is invalid."
 msgstr "El format nou no és vàlid."
 
-#: src/protocols/oscar/oscar.c:7297
+#: ../src/protocols/oscar/oscar.c:7153
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El format del nom d'usuari només pot canviar majúscules i minúscules, i "
 "espais en blanc."
 
-#: src/protocols/oscar/oscar.c:7304
+#: ../src/protocols/oscar/oscar.c:7160
 msgid "New screen name formatting:"
 msgstr "Format nou del nom d'usuari:"
 
-#: src/protocols/oscar/oscar.c:7356
+#: ../src/protocols/oscar/oscar.c:7212
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-#: src/protocols/oscar/oscar.c:7401
+#: ../src/protocols/oscar/oscar.c:7257
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>no esteu esperant l'autorització</i>"
 
-#: src/protocols/oscar/oscar.c:7404
+#: ../src/protocols/oscar/oscar.c:7260
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Esteu esperant l'autorització dels següents amics"
 
-#: src/protocols/oscar/oscar.c:7405
+#: ../src/protocols/oscar/oscar.c:7261
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8927,80 +8982,78 @@
 "amb el botó dret del ratolí, i seleccionant \"Torna a demanar l'autorització"
 "\"."
 
-#: src/protocols/oscar/oscar.c:7422
+#: ../src/protocols/oscar/oscar.c:7278
 msgid "Find Buddy by E-mail"
 msgstr "Troba un amic per l'adreça de correu"
 
-#: src/protocols/oscar/oscar.c:7423
+#: ../src/protocols/oscar/oscar.c:7279
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un amic per l'adreça de correu"
 
-#: src/protocols/oscar/oscar.c:7424
+#: ../src/protocols/oscar/oscar.c:7280
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriviu l'adreça de correu de l'amic que estigueu cercant."
 
-#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
+#: ../src/protocols/oscar/oscar.c:7297
+msgid "Available Message:"
+msgstr "Missatge de disponibilitat:"
+
+#: ../src/protocols/oscar/oscar.c:7298
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "Estic fent feina i espero una distracció; parleu amb mi."
+
+#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/silc/silc.c:812
 msgid "Set User Info..."
 msgstr "Estableix informació d'usuari..."
 
-#: src/protocols/oscar/oscar.c:7511
+#: ../src/protocols/oscar/oscar.c:7384
 msgid "Set User Info (URL)..."
 msgstr "Estableix informació d'usuari (URL)..."
 
-#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
+#: ../src/protocols/oscar/oscar.c:7390
+msgid "Set Available Message..."
+msgstr "Estableix el missatge de disponibilitat..."
+
+#: ../src/protocols/oscar/oscar.c:7395 ../src/protocols/silc/silc.c:808
 msgid "Change Password..."
 msgstr "Canvia la contrasenya..."
 
-#: src/protocols/oscar/oscar.c:7522
+#: ../src/protocols/oscar/oscar.c:7400
 msgid "Change Password (URL)"
 msgstr "Canvia la contrasenya (URL)"
 
-#: src/protocols/oscar/oscar.c:7526
+#: ../src/protocols/oscar/oscar.c:7404
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura el reenviament de MI (URL)"
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7536
-msgid "Show privacy options..."
-msgstr "Mostra les opcions de privadesa..."
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7543
+#: ../src/protocols/oscar/oscar.c:7413
 msgid "Format Screen Name..."
 msgstr "Format del nom d'usuari..."
 
-#: src/protocols/oscar/oscar.c:7547
+#: ../src/protocols/oscar/oscar.c:7417
 msgid "Confirm Account"
 msgstr "Confirma el compte"
 
-#: src/protocols/oscar/oscar.c:7551
+#: ../src/protocols/oscar/oscar.c:7421
 msgid "Display Currently Registered Address"
 msgstr "Mostra les adreces actualment registrades"
 
-#: src/protocols/oscar/oscar.c:7555
+#: ../src/protocols/oscar/oscar.c:7425
 msgid "Change Currently Registered Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
-#: src/protocols/oscar/oscar.c:7562
+#: ../src/protocols/oscar/oscar.c:7432
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra els amics pendents d'autorització"
 
-#: src/protocols/oscar/oscar.c:7568
+#: ../src/protocols/oscar/oscar.c:7438
 msgid "Search for Buddy by Email..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
-#: src/protocols/oscar/oscar.c:7573
+#: ../src/protocols/oscar/oscar.c:7443
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informació"
 
-#: src/protocols/oscar/oscar.c:7643
-msgid "Use recent buddies group"
-msgstr "Usa el grup d'amics recent"
-
-#: src/protocols/oscar/oscar.c:7646
-msgid "Show how long you have been idle"
-msgstr "Mostra quant de temps heu estat inactiu"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9011,77 +9064,77 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
+#: ../src/protocols/oscar/oscar.c:7591 ../src/protocols/oscar/oscar.c:7593
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Connector per al protocol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7788
+#: ../src/protocols/oscar/oscar.c:7612
 msgid "Auth host"
 msgstr "Ordinador d'autorització"
 
-#: src/protocols/oscar/oscar.c:7791
+#: ../src/protocols/oscar/oscar.c:7615
 msgid "Auth port"
 msgstr "Port d'autorització"
 
-#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:7618 ../src/protocols/zephyr/zephyr.c:2748
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
-#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
-#: src/protocols/silc/ft.c:338
+#: ../src/protocols/silc/buddy.c:51 ../src/protocols/silc/buddy.c:414
+#: ../src/protocols/silc/buddy.c:539 ../src/protocols/silc/buddy.c:706
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "L'usuari %s no està present a la xarxa"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
-#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
-#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
-#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:109
+#: ../src/protocols/silc/buddy.c:114 ../src/protocols/silc/buddy.c:118
+#: ../src/protocols/silc/buddy.c:123 ../src/protocols/silc/buddy.c:128
+#: ../src/protocols/silc/buddy.c:133 ../src/protocols/silc/buddy.c:251
 msgid "Key Agreement"
 msgstr "Acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "No s'ha pogut fer l'acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:110
+#: ../src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr "S'ha produït un error en l'acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:114
+#: ../src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
 msgstr "Ha fallat l'acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
-msgstr "S'ha exedit el temps d'espera en l'acord sobre la clau"
-
-#: src/protocols/silc/buddy.c:124
+msgstr "S'ha excedit el temps d'espera per a l'acord sobre la clau"
+
+#: ../src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
 msgstr "S'ha aborat l'acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
 msgstr "L'acord sobre la clau ja està iniciat"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:134
 msgid "Key agreement cannot be started with yourself"
 msgstr "L'acord sobre la clau no es pot inicialitzar amb un mateix"
 
-#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
-#: src/protocols/silc/buddy.c:507
+#: ../src/protocols/silc/buddy.c:252 ../src/protocols/silc/buddy.c:382
+#: ../src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
 msgstr "L'usuari remot ja no està present a la xarxa"
 
-#: src/protocols/silc/buddy.c:288
+#: ../src/protocols/silc/buddy.c:288
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "S'ha rebut un acord sobre la clau de %s. Voleu acceptar-lo?"
 
-#: src/protocols/silc/buddy.c:292
+#: ../src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9092,77 +9145,78 @@
 "Ordinador remot: %s\n"
 "Port remot: %d"
 
-#: src/protocols/silc/buddy.c:305
+#: ../src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
 msgstr "Sol·licitud d'acord sobre la clau"
 
-#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
-#: src/protocols/silc/buddy.c:458
+#: ../src/protocols/silc/buddy.c:381 ../src/protocols/silc/buddy.c:416
+#: ../src/protocols/silc/buddy.c:458
 msgid "IM With Password"
 msgstr "MI amb contrasenya"
 
-#: src/protocols/silc/buddy.c:417
+#: ../src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr "No s'ha pogut establir la clau de MI"
 
-#: src/protocols/silc/buddy.c:459
+#: ../src/protocols/silc/buddy.c:459
 msgid "Set IM Password"
 msgstr "Especifica la contrasenya de MI"
 
-#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
+#: ../src/protocols/silc/buddy.c:506 ../src/protocols/silc/buddy.c:541
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
-msgstr "Obtingues la clau pública"
-
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
-#: src/protocols/silc/ops.c:1294
+msgstr "Aconsegueix la clau pública"
+
+#: ../src/protocols/silc/buddy.c:542 ../src/protocols/silc/ops.c:1285
+#: ../src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr "No s'ha pogut obtenir la clau pública"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
+#: ../src/protocols/silc/buddy.c:629 ../src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr "Mostra la clau pública"
 
-#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:630 ../src/protocols/silc/buddy.c:989
+#: ../src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "No s'ha pogut carregar la clau pública"
 
-#: src/protocols/silc/buddy.c:707 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:1101
+#: ../src/protocols/silc/buddy.c:707 ../src/protocols/silc/ops.c:871
+#: ../src/protocols/silc/ops.c:943 ../src/protocols/silc/ops.c:1078
+#: ../src/protocols/silc/ops.c:1079 ../src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "Informació de l'usuari"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: ../src/protocols/silc/buddy.c:708 ../src/protocols/silc/ops.c:944
+#: ../src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "No s'ha pogut obtenir informació de l'usuari"
 
-#: src/protocols/silc/buddy.c:729
+#: ../src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "No es confia en l'amic %s"
 
-#: src/protocols/silc/buddy.c:732
+#: ../src/protocols/silc/buddy.c:732
 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 ""
 "No podeu rebre notificacions d'amic fins que no hagueu importat la seva clau "
-"pública. Podeu fer servir l'ordre 'Obtingues la clau pública' per obtenir-la."
+"pública. Podeu fer servir l'ordre 'Aconsegueix la clau pública' per obtenir-"
+"la."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1023
+#: ../src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "Obre..."
 
-#: src/protocols/silc/buddy.c:1032
+#: ../src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "L'amic %s no està present a la xarxa"
 
-#: src/protocols/silc/buddy.c:1035
+#: ../src/protocols/silc/buddy.c:1035
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9170,15 +9224,15 @@
 "Per afegir un amic heu d'importar la seva clau pública. Feu clic a Importa "
 "per importar la clau pública."
 
-#: src/protocols/silc/buddy.c:1038
+#: ../src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr "Importa..."
 
-#: src/protocols/silc/buddy.c:1125
+#: ../src/protocols/silc/buddy.c:1125
 msgid "Select correct user"
 msgstr "Seleccioneu l'usuari correcte"
 
-#: src/protocols/silc/buddy.c:1127
+#: ../src/protocols/silc/buddy.c:1127
 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."
@@ -9186,7 +9240,7 @@
 "S'ha trobat més d'un usuari amb la mateixa clau pública. Seleccioneu "
 "l'usuari correcte de la llista per afegir-lo a la llista d'amics."
 
-#: src/protocols/silc/buddy.c:1129
+#: ../src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9194,213 +9248,216 @@
 "S'ha trobat més d'un usuari amb el mateix nom. Seleccioneu l'usuari correcte "
 "per afegir a la llista d'amics."
 
-#: src/protocols/silc/buddy.c:1410
+#: ../src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "Separat"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1390 ../src/protocols/silc/silc.c:49
+#: ../src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "Indisposat"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
+#: ../src/protocols/silc/buddy.c:1394 ../src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "Desperta'm"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
+#: ../src/protocols/silc/buddy.c:1396 ../src/protocols/silc/silc.c:46
+#: ../src/protocols/silc/silc.c:79
 msgid "Hyper Active"
-msgstr "Súperactiu"
-
-#: src/protocols/silc/buddy.c:1422
+msgstr "Hiperactiu"
+
+#: ../src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1405 ../src/protocols/silc/silc.c:629
+#: ../src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Content"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1407 ../src/protocols/silc/silc.c:631
+#: ../src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Trist"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1409 ../src/protocols/silc/silc.c:633
+#: ../src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Enfadat"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1411 ../src/protocols/silc/silc.c:635
+#: ../src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Gelós"
 
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1413 ../src/protocols/silc/silc.c:637
+#: ../src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Avergonyit"
 
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1415 ../src/protocols/silc/silc.c:639
+#: ../src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invisible"
 
-#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1417 ../src/protocols/silc/silc.c:641
+#: ../src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Enamorat"
 
-#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1419 ../src/protocols/silc/silc.c:643
+#: ../src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Endormiscat"
 
-#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1421 ../src/protocols/silc/silc.c:645
+#: ../src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Avorrit"
 
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1423 ../src/protocols/silc/silc.c:647
+#: ../src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Excitat"
 
-#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1425 ../src/protocols/silc/silc.c:649
+#: ../src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Ansiós"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1457 ../src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "Modes d'usuari"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1466 ../src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Estat d'ànim"
 
-#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
+#: ../src/protocols/silc/buddy.c:1470 ../src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Text d'estat"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Contacte preferit"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1480 ../src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Idioma preferit"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1485 ../src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Dispositiu"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/ops.c:1016
+#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/silc.c:699
 msgid "Timezone"
 msgstr "Fus horari"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1495 ../src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Ubicació geogràfica"
 
-#: src/protocols/silc/buddy.c:1562
+#: ../src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr "Reinicia la clau de MI"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr "MI amb intercanvi de clau"
 
-#: src/protocols/silc/buddy.c:1571
+#: ../src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr "MI amb contrasenya"
 
-#: src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
-msgstr "Obtingues la clau pública..."
-
-#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
+msgstr "Aconsegueix la clau pública..."
+
+#: ../src/protocols/silc/buddy.c:1564 ../src/protocols/silc/ops.c:1417
 msgid "Kill User"
 msgstr "Mata l'usuari"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "_Contrasenya:"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existeix el canal %s a la xarxa"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:79 ../src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "Informació del canal"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "No s'ha pogut obtenir la informació del canal"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nom del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Nombre d'usuaris:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Xifrat del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modes del canal:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Empremta de la clau del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Empremta babble de la clau del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "Afegeix clau pública del canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "Obre una clau pública..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Contrasenya del canal"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "Llista de les claus públiques del canal"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9414,319 +9471,318 @@
 "claus públiques del canal, només els usuaris que tinguin les seves claus "
 "públiques llistades al canal hi podran entrar."
 
-#: 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:418 ../src/protocols/silc/chat.c:419
+#: ../src/protocols/silc/chat.c:456 ../src/protocols/silc/chat.c:457
+#: ../src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "Autenticació del canal"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "Afegeix / Suprimeix"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Nom del grup"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
+#: ../src/protocols/silc/chat.c:579 ../src/protocols/silc/ops.c:1697
 msgid "Passphrase"
 msgstr "Contrasenya"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduïu el nom del grup privat i la frase clau per al canal %s."
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "Afegeix un grup privat al canal"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "L'imit d'usuaris"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Estableix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el "
 "límit."
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:862
 msgid "Get Info"
-msgstr "Obtingues informació"
-
-#: src/protocols/silc/chat.c:871
+msgstr "Aconsegueix informació"
+
+#: ../src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "Llista de convidats"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "Llista de proscrits"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "Afegeix un grup privat"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "Reiniciació permanent"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "Estableix a permanent"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "Estableix el límit d'usuaris"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "Reinicia la restricció del tema"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "Estableix restricció del tema"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "Reinicia el canal privat"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "Estableix canal privat"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "Reinicia canal secret"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "Estableix canal secret"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sou fundador del canal a <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal a <I>%s</I> és <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../src/protocols/silc/chat.c:1056
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Primer heu d'entrar al canal %s per després poder entrar al grup privat"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "Entra al grup privat"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "No s'ha pogut entrar al grup privat"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
+#: ../src/protocols/silc/chat.c:1252 ../src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr "No s'ha pogut cridar l'ordre"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
+#: ../src/protocols/silc/chat.c:1253 ../src/protocols/silc/silc.c:912
 msgid "Unknown command"
 msgstr "Ordre desconeguda"
 
-#: 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 "Transferència de fitxers segura"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../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 "S'ha produït un error en la transferència"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Ha fallat l'acord sobre la clau"
 
-#: src/protocols/silc/ft.c:102
-#, fuzzy
-msgid "File transfer session does not exist"
+#: ../src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
 msgstr "Les sessions de transferència de fitxers no existeixen"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "No hi ha cap sessió activa per a la transferència de fitxers"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Ja s'ha iniciat la transferència del fitxer"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "No s'ha pogut acordar una clau per a la transferència del fitxer"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "No s'ha pogut iniciar la transferència del fitxer"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "No s'ha pogut enviar el fitxer"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:339 ../src/protocols/silc/ops.c:348
+#: ../src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha canviat el tema de <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ha canviat el mode del canal <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ha suprimit tos els modes del canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ha canviat el mode de <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ha suprimit tots els modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "<I>%2$s</I> us ha fet fora de <I>%1$s</I> (%3$s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:527 ../src/protocols/silc/ops.c:532
+#: ../src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "%s us ha matat (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:558 ../src/protocols/silc/ops.c:563
+#: ../src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "%s us ha matat (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "Desconnexió del servidor"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "Informació personal"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "Data de naixement"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "Títol de la feina"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "Rol a la feina"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "Organització"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "Unitat"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "Correu"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "Entrar a un xat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: ../src/protocols/silc/ops.c:1068 ../src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "Emprenta de la clau pública"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: ../src/protocols/silc/ops.c:1069 ../src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "Empremta babble de la clau pública"
 
-#: src/protocols/silc/ops.c:1084
+#: ../src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "Més..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
+#: ../src/protocols/silc/ops.c:1155 ../src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr "Separa del servidor"
 
-#: src/protocols/silc/ops.c:1159
+#: ../src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "No s'ha pogut separar"
 
-#: src/protocols/silc/ops.c:1170
+#: ../src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "No s'ha pogut establir el tema"
 
-#: src/protocols/silc/ops.c:1202
+#: ../src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: src/protocols/silc/ops.c:1250
+#: ../src/protocols/silc/ops.c:1241 ../src/protocols/silc/ops.c:1252
 msgid "Roomlist"
 msgstr "Llista de sales"
 
-#: src/protocols/silc/ops.c:1250
+#: ../src/protocols/silc/ops.c:1241 ../src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
 msgstr "No s'ha pogut obtenir la llista de sales"
 
-#: src/protocols/silc/ops.c:1295
+#: ../src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr "No s'ha rebut cap clau pública"
 
-#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
+#: ../src/protocols/silc/ops.c:1310 ../src/protocols/silc/ops.c:1324
 msgid "Server Information"
 msgstr "Informació del servidor"
 
-#: src/protocols/silc/ops.c:1309
+#: ../src/protocols/silc/ops.c:1311
 msgid "Cannot get server information"
 msgstr "No s'ha pogut obtenir informació del servidor"
 
-#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
+#: ../src/protocols/silc/ops.c:1342 ../src/protocols/silc/ops.c:1351
 msgid "Server Statistics"
 msgstr "Estadístiques del servidor"
 
-#: src/protocols/silc/ops.c:1339
+#: ../src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr "No s'han pogut obtenir estadístiques del servidor"
 
-#: src/protocols/silc/ops.c:1348
+#: ../src/protocols/silc/ops.c:1352
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
-#: src/protocols/silc/ops.c:1370
+#: ../src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9761,104 +9817,104 @@
 "Total operdors del servidor: %d\n"
 "Total operadors de l'encaminador: %d\n"
 
-#: src/protocols/silc/ops.c:1393
+#: ../src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
-#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
+#: ../src/protocols/silc/ops.c:1405 ../src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1401
+#: ../src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
-#: src/protocols/silc/ops.c:1406
+#: ../src/protocols/silc/ops.c:1410
 msgid "Ping reply received from server"
 msgstr "S'ha rebut la resposta al ping del servidor"
 
-#: src/protocols/silc/ops.c:1414
+#: ../src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr "No s'ha pogut matar l'usuari"
 
-#: src/protocols/silc/ops.c:1498
+#: ../src/protocols/silc/ops.c:1499
 msgid "Error during connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
-#: src/protocols/silc/ops.c:1503
+#: ../src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr "Ha fallat l'intercanvi de claus"
 
-#: src/protocols/silc/ops.c:1512
+#: ../src/protocols/silc/ops.c:1513
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
 "connectar» per crear una nova connexió."
 
-#: src/protocols/silc/ops.c:1547
+#: ../src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
-#: src/protocols/silc/silc.c:203
+#: ../src/protocols/silc/ops.c:1608 ../src/protocols/silc/ops.c:1655
+#: ../src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr "S'està reprenent la sessió"
 
-#: src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1610
 msgid "Authenticating connection"
 msgstr "S'està autenticant la connexió"
 
-#: src/protocols/silc/ops.c:1658
+#: ../src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr "S'està verificant la clau pública del servidor"
 
-#: src/protocols/silc/ops.c:1699
+#: ../src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr "Cal contrasenya"
 
-#: src/protocols/silc/ops.c:1728
+#: ../src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fallida: Les versions no coincideixen, actualitzeu el client"
 
-#: src/protocols/silc/ops.c:1731
+#: ../src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallida: El remot no es fia de o no suporta la vostra clau pública"
 
-#: src/protocols/silc/ops.c:1734
+#: ../src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallida: El remot no implementa el grup KE proposat"
 
-#: src/protocols/silc/ops.c:1737
+#: ../src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fallida: El remot no implementa el xifrat proposat"
 
-#: src/protocols/silc/ops.c:1740
+#: ../src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallida: El remot no implementa la PKCS proposada"
 
-#: src/protocols/silc/ops.c:1743
+#: ../src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Fallida: El remot no implementa la funció de suma de comprovació proposada"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallida: El remot no implementa la HMAC proposada"
 
-#: src/protocols/silc/ops.c:1748
+#: ../src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr "Fallida: La signatura no és correcta"
 
-#: src/protocols/silc/ops.c:1750
+#: ../src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr "Fallida: La galeta no és vàlida"
 
-#: src/protocols/silc/ops.c:1761
+#: ../src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr "Error: Ha fallat l'autenticació"
 
-#: 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 "
@@ -9867,12 +9923,12 @@
 "S'ha rebut la clau pública de %s. La còpia local de la clau no coincideix. "
 "Voleu acceptar aquesta clau pública, de tota manera?"
 
-#: 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'ha rebut la clau pública de %s. Voleu acceptar-la?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9885,48 +9941,48 @@
 "%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 "Verifica la clau pública"
 
-#: src/protocols/silc/pk.c:119
+#: ../src/protocols/silc/pk.c:119
 msgid "View..."
 msgstr "Visualitza..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "El tipus de la clau pública no està suportat"
 
-#: src/protocols/silc/silc.c:163
+#: ../src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
-#: src/protocols/silc/silc.c:206
+#: ../src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-#: src/protocols/silc/silc.c:279
+#: ../src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr "Sense memòria"
 
 #. Progress
-#: src/protocols/silc/silc.c:318
+#: ../src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr "S'està connectant al servidor SILC"
 
-#: src/protocols/silc/silc.c:639
+#: ../src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr "El vostre estat d'ànim actual"
 
-#: src/protocols/silc/silc.c:641
+#: ../src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:666
+#: ../src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9934,43 +9990,43 @@
 "\n"
 "El vostre mètode de contacte preferit"
 
-#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:660 ../src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:662 ../src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:664 ../src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Videoconferència"
 
-#: src/protocols/silc/silc.c:683
+#: ../src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr "El vostre estat actual"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:676
 msgid "Online Services"
 msgstr "Serveis en línia"
 
-#: src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr "Permet que els altres vegin quins serveis feu servir"
 
-#: src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr "Permet que els altres vegin quin ordinador feu servir"
 
-#: src/protocols/silc/silc.c:706
+#: ../src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr "El fitxer de la vostra VCard"
 
-#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr "Atributs de l'estat de l'usuari en línia"
 
-#: src/protocols/silc/silc.c:721
+#: ../src/protocols/silc/silc.c:707
 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 "
@@ -9980,131 +10036,135 @@
 "línia, així com informació personal. Empleneu la informació que vulgueu que "
 "altres usuaris puguin veure."
 
-#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
-#: src/protocols/silc/silc.c:1171
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:753
+#: ../src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr "Frase del dia"
 
-#: src/protocols/silc/silc.c:761
+#: ../src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr "No es disposa de frase del dia"
 
-#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
+#: ../src/protocols/silc/silc.c:748 ../src/protocols/silc/silc.c:1155
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hi ha cap frase del dia associada amb aquesta connexió"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:795
 msgid "Online Status"
 msgstr "Estat en línia"
 
-#: src/protocols/silc/silc.c:818
+#: ../src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr "Mostra la frase del dia"
 
-#: src/protocols/silc/silc.c:891
+#: ../src/protocols/silc/silc.c:876
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "L'usuari <I>%s</I> no està present a la xarxa"
 
-#: src/protocols/silc/silc.c:1042
+#: ../src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "Ha fallat en sortir del canal"
+
+#: ../src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr "El tema és massa llarg"
 
-#: src/protocols/silc/silc.c:1123
+#: ../src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr "Heu d'indicar un sobrenom"
 
-#: src/protocols/silc/silc.c:1225
+#: ../src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr "No s'ha trobat el canal %s"
 
-#: src/protocols/silc/silc.c:1230
+#: ../src/protocols/silc/silc.c:1219
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Els modes del canal %s són: %s"
 
-#: src/protocols/silc/silc.c:1232
+#: ../src/protocols/silc/silc.c:1221
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no s'ha especificat cap mode per a %s"
 
-#: src/protocols/silc/silc.c:1245
+#: ../src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ha fallat en posar modes per a %s"
 
-#: src/protocols/silc/silc.c:1275
+#: ../src/protocols/silc/silc.c:1264
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Ordre desconeguda: %s, (pot ser un error del Gaim)"
 
-#: src/protocols/silc/silc.c:1338
+#: ../src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Surt del xat"
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Surt del xat"
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1335
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;tema nou&gt;]:  Mostra o canvia el tema"
 
-#: src/protocols/silc/silc.c:1351
+#: ../src/protocols/silc/silc.c:1340
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;canal&gt; [&lt;contrasenya&gt;]:  Entra en un xat d'aquesta xarxa"
 
-#: src/protocols/silc/silc.c:1355
+#: ../src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr "list:  Llista els canals en aquesta xarxa"
 
-#: src/protocols/silc/silc.c:1359
+#: ../src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;sobrenom&gt;:  Mostra informació sobre el sobrenom"
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1352 ../src/protocols/zephyr/zephyr.c:2466
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;sobrenom&gt; &lt;missatge&gt;:  Envia un missatge privat a l'usuari "
 "indicat"
 
-#: src/protocols/silc/silc.c:1367
+#: ../src/protocols/silc/silc.c:1356
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;sobrenom&gt; [&lt;missatge&gt;]:  Envia un missatge provat a "
 "l'usuari"
 
-#: src/protocols/silc/silc.c:1371
+#: ../src/protocols/silc/silc.c:1360
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  mostra la frase del dia del servidor"
 
-#: src/protocols/silc/silc.c:1375
+#: ../src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr "detach:  Separa aquesta sessió"
 
-#: src/protocols/silc/silc.c:1379
+#: ../src/protocols/silc/silc.c:1368
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [missatge]:  Desconnecta del servidor, amb un missatge opcional"
 
-#: src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1372
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;ordre&gt;:  Crida un ordre del client slic"
 
-#: src/protocols/silc/silc.c:1389
+#: ../src/protocols/silc/silc.c:1378
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;sobrenom&gt; [-pubkey|&lt;motiu&gt;]:  Mata un sobrenom"
 
-#: src/protocols/silc/silc.c:1393
+#: ../src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;sobrenom nou&gt;:  Canvia de sobrenom"
 
-#: src/protocols/silc/silc.c:1397
+#: ../src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;sobrenom&gt;:  Mostra informació sobre el sobrenom"
 
-#: src/protocols/silc/silc.c:1401
+#: ../src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10112,7 +10172,7 @@
 "cmode &lt;canal&gt; [+|-&lt;modes&gt;] [arguments]:  Canvia o mostra els "
 "modes del canal"
 
-#: src/protocols/silc/silc.c:1405
+#: ../src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10120,15 +10180,15 @@
 "cumode &lt;canal&gt; +|-&lt;modes&gt; &lt;sobrenom&gt;:  Canvia el mode del "
 "canal per al sobrenom"
 
-#: src/protocols/silc/silc.c:1409
+#: ../src/protocols/silc/silc.c:1398
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes d'usuari&gt;:  Canvia el vostre mode a la xarxa"
 
-#: src/protocols/silc/silc.c:1413
+#: ../src/protocols/silc/silc.c:1402
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;sobrenom&gt; [-pubkey]:  Dona privilegis d'operador"
 
-#: src/protocols/silc/silc.c:1417
+#: ../src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10136,37 +10196,37 @@
 "invite &lt;canal&gt; [-|+]&lt;sobrenom&gt;:  convida el sobrenom o afegeix/"
 "suprimeix de la llista de convidats al canal"
 
-#: src/protocols/silc/silc.c:1421
+#: ../src/protocols/silc/silc.c:1410
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;sobrenom&gt; [comentari]:  Fa fora del canal el client"
 
-#: src/protocols/silc/silc.c:1425
+#: ../src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Mostra detalls administratius del servidor"
 
-#: src/protocols/silc/silc.c:1429
+#: ../src/protocols/silc/silc.c:1418
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;sobrenom&gt;]:  Proscriu un client del canal"
 
-#: src/protocols/silc/silc.c:1433
+#: ../src/protocols/silc/silc.c:1422
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;sobrenom|servidor&gt;:  Obté la clau pública del client o servidor"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Mostra estadístiques de xarxa del servidor"
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia un PING al servidor on esteu connectat"
 
-#: src/protocols/silc/silc.c:1446
+#: ../src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Llista els usuaris d'un canal"
 
-#: src/protocols/silc/silc.c:1450
+#: ../src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10174,27 +10234,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canal(s)&gt;:  Llista "
 "usuari especificats del canal"
 
-#: src/protocols/silc/silc.c:1462
+#: ../src/protocols/silc/silc.c:1451
 msgid "Instant Messages"
 msgstr "Missatges instantanis"
 
-#: src/protocols/silc/silc.c:1467
+#: ../src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr "Signa digitalment tots els meus MI"
 
-#: src/protocols/silc/silc.c:1472
+#: ../src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr "Verifica totes les signatures dels MI"
 
-#: src/protocols/silc/silc.c:1475
+#: ../src/protocols/silc/silc.c:1464
 msgid "Channel Messages"
 msgstr "Missatges del canal"
 
-#: src/protocols/silc/silc.c:1480
+#: ../src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr "Signa digitalment tots els missatges del canal"
 
-#: src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr "Verifica totes les signatures dels missatges del canal"
 
@@ -10207,94 +10267,92 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1573
+#: ../src/protocols/silc/silc.c:1563
 msgid "SILC Protocol Plugin"
 msgstr "Connector per al protocol SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1575
+#: ../src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocol per a conferències en viu segures per Internet (SILC)"
 
-#: src/protocols/silc/silc.c:1609
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1599
 msgid "Public Key file"
 msgstr "Fitxer de la clau pública"
 
-#: src/protocols/silc/silc.c:1613
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1603
 msgid "Private Key file"
 msgstr "Fitxer de la clau privada"
 
-#: src/protocols/silc/silc.c:1616
+#: ../src/protocols/silc/silc.c:1606
 msgid "Public key authentication"
 msgstr "Autenticació per clau pública"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1610
 msgid "Reject watching by other users"
 msgstr "No permetis ser observat per altres usuaris"
 
-#: src/protocols/silc/silc.c:1623
+#: ../src/protocols/silc/silc.c:1613
 msgid "Block invites"
 msgstr "Bloca invitacions"
 
-#: src/protocols/silc/silc.c:1626
+#: ../src/protocols/silc/silc.c:1616
 msgid "Block IMs without Key Exchange"
 msgstr "Bloca MI sense intercanvi de claus"
 
-#: src/protocols/silc/silc.c:1629
+#: ../src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr "Rebutja les sol·licituds quant als atributs en línia"
 
 # DUBTE: "key pair" --> "joc de claus", o "parell de claus"?
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/util.c:205 ../src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "S'està creant el joc de claus 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:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom real: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'usuari: \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Correu electrònic: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ordinador: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organització: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Lengitud de la clau: \t%d bits\n"
-
-#: src/protocols/silc/util.c:327
+msgstr "Longitud de la clau: \t%d bits\n"
+
+#: ../src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10305,7 +10363,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10314,137 +10372,137 @@
 "Empremta babble de la clau pública:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:332 ../src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Informació de la clau pública"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "Radiomissatgeria"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "Ordinador"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "S'està cercant %s"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Entrada: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No s'ha pogut escriure el fitxer %s."
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No s'ha pogut llegir el fitxer %s."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "El missatge és massa llarg, s'han retallat els últims %s octets."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
-msgstr "%s està desconnectat."
-
-#: src/protocols/toc/toc.c:494
+msgstr "%s no està connectat."
+
+#: ../src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Avís de %s no permès."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "S'ha ignorat un missatge. Esteu excedint el límit de velocitat del servidor."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "El xat a %s no està disponible."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esteu enviant missatges massa depressa a %s."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Heu perdut un missatge instantani de %s perquè s'ha enviat massa depressa."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Fallada."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Massa coincidències."
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Es necessiten més qualificadors."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Servei de directori no disponible temporalment."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Recerca per adreça de correu electrònic restringida."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "S'ha ignorat la paraula clau."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "No hi ha paraules clau."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "L'usuari no té informació al directori."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "País no suportat."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallada desconeguda: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "El servei està temporalment no disponible."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:550
 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."
@@ -10453,42 +10511,37 @@
 "minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
 "encara més."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Hi ha hagut un error de connexió desconegut: %s."
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconegut, %d ha succeït. Informació: %s"
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "El nom del grup no és vàlid"
-
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Connexió tancada"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "S'està esperant una resposta..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "S'ha canviat la contrasenya amb èxit"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ha enviat l'ordre PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:897
 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 "
@@ -10498,47 +10551,47 @@
 "fora si envieu un missatge. Gaim evitarà que passi res d'això. Això és només "
 "temporalment. Si us plau, tingueu paciència."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1450
 msgid "Get Dir Info"
-msgstr "Obtingues informació del directori"
-
-#: src/protocols/toc/toc.c:1689
+msgstr "Aconsegueix informació del directori"
+
+#: ../src/protocols/toc/toc.c:1586
 msgid "Set Dir Info"
 msgstr "Estableix informació del directori"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1708
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1744
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 "l'altra banda."
 
-#: 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:1789 ../src/protocols/toc/toc.c:1829
+#: ../src/protocols/toc/toc.c:1953 ../src/protocols/toc/toc.c:2041
 msgid "Could not connect for transfer."
 msgstr "No s'ha pogut connectar per realitzar la transferència."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:1986
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No s'ha pogut escriure la capçalera del fitxer. El fitxer no serà enviat."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2086
 msgid "Gaim - Save As..."
 msgstr "Gaim - Anomena i desa..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2120
 #, 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 demana %s acceptar %d fitxer: %s (%.2f %s)%s%s"
 msgstr[1] "%s demana %s acceptar %d fitxers: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2127
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s us demana que li envieu un fitxer"
@@ -10553,84 +10606,84 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2214 ../src/protocols/toc/toc.c:2216
 msgid "TOC Protocol Plugin"
 msgstr "Connector per al protocol TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2235
 msgid "TOC host"
 msgstr "Servidor TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2239
 msgid "TOC port"
 msgstr "Port TOC"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:264
+#: ../src/protocols/trepia/trepia.c:264
 msgid "Basic Profile"
 msgstr "Perfil bàsic"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:295
+#: ../src/protocols/trepia/trepia.c:295
 msgid "E-Mail Address"
 msgstr "Adreça de correu electrònic"
 
-#: src/protocols/trepia/trepia.c:301
+#: ../src/protocols/trepia/trepia.c:301
 msgid "Profile Information"
 msgstr "Informació del perfil"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:307
+#: ../src/protocols/trepia/trepia.c:307
 msgid "Instant Messagers"
 msgstr "Missatgers instantanis"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:311
+#: ../src/protocols/trepia/trepia.c:311
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:315
+#: ../src/protocols/trepia/trepia.c:315
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:319
+#: ../src/protocols/trepia/trepia.c:319
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:323
+#: ../src/protocols/trepia/trepia.c:323
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:328
+#: ../src/protocols/trepia/trepia.c:328
 msgid "I'm From"
 msgstr "Jo sóc de"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:345
+#: ../src/protocols/trepia/trepia.c:345
 msgid "Set your Trepia profile data."
 msgstr "Establiu les dades del vostre perfil de Trepia"
 
-#: src/protocols/trepia/trepia.c:425
+#: ../src/protocols/trepia/trepia.c:425
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/protocols/trepia/trepia.c:439
+#: ../src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "Estableix perfil"
 
-#: src/protocols/trepia/trepia.c:476
+#: ../src/protocols/trepia/trepia.c:476
 msgid "Visit Homepage"
 msgstr "Visita la pàgina inicial"
 
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+#: ../src/protocols/trepia/trepia.c:822 ../src/protocols/trepia/trepia.c:825
 msgid "Local Users"
 msgstr "Usuaris locals"
 
-#: src/protocols/trepia/trepia.c:1032
+#: ../src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr "S'està connectant"
 
@@ -10644,19 +10697,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: ../src/protocols/trepia/trepia.c:1275 ../src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr "Connector per al protocol Trepia"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: ../src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+"Se us ha desconnectat ja que us heu connectat de d'un altre ordinador o "
+"dispositiu."
+
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
+#: ../src/protocols/yahoo/yahoo.c:936 ../src/protocols/yahoo/yahoo.c:3520
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: ../src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Missatge del sistema de yahoo! per a %s:"
@@ -10664,23 +10725,22 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #. *
-#: src/protocols/yahoo/yahoo.c:853
-#, fuzzy, c-format
+#: ../src/protocols/yahoo/yahoo.c:1072
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "L'usuari %s vol afegir %s a la seva llista d'amics."
-
-#: src/protocols/yahoo/yahoo.c:859
-#, fuzzy
+msgstr "L'usuari %s vol afegir %s a la seva llista d'amics%s%s."
+
+#: ../src/protocols/yahoo/yahoo.c:1078
 msgid "Message (optional) :"
-msgstr "Notificació de missatges"
-
-#: src/protocols/yahoo/yahoo.c:901
+msgstr "Missatge (opcional) :"
+
+#: ../src/protocols/yahoo/yahoo.c:1120
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s us ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
 
-#: src/protocols/yahoo/yahoo.c:904
+#: ../src/protocols/yahoo/yahoo.c:1123
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10690,11 +10750,11 @@
 "pel següent motiu:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/yahoo/yahoo.c:1126
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
-#: src/protocols/yahoo/yahoo.c:1659
+#: ../src/protocols/yahoo/yahoo.c:1887
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10705,11 +10765,11 @@
 "reconegut. Aquesta versió de Gaim no podrà connectar-se correctament a "
 "Yahoo. Comproveu si hi ha actualitzacions a %s."
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: ../src/protocols/yahoo/yahoo.c:1890
 msgid "Failed Yahoo! Authentication"
 msgstr "Ha fallat l'autenticació amb Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1735
+#: ../src/protocols/yahoo/yahoo.c:1962
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10718,19 +10778,19 @@
 "Heu intentat ignorar a %s, però l'usuari no és a la vostra llista d'amics. "
 "Fent clic a \"Sí\" se suprimirà i s'ignorarà l'amic."
 
-#: src/protocols/yahoo/yahoo.c:1738
+#: ../src/protocols/yahoo/yahoo.c:1965
 msgid "Ignore buddy?"
 msgstr "Voleu ignorar l'amic?"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1999
 msgid "Invalid username."
 msgstr "El nom d'usuari no és vàlid"
 
-#: src/protocols/yahoo/yahoo.c:1783
+#: ../src/protocols/yahoo/yahoo.c:2010
 msgid "Normal authentication failed!"
 msgstr "Ha fallat l'autenticació normal"
 
-#: src/protocols/yahoo/yahoo.c:1784
+#: ../src/protocols/yahoo/yahoo.c:2011
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10742,121 +10802,102 @@
 "El Gaim intentarà connectar fent servir l'autenticació Web Messenger, que "
 "implica que no tindreu tantes funcionalitats disponibles."
 
-#: src/protocols/yahoo/yahoo.c:1792
+#: ../src/protocols/yahoo/yahoo.c:2019
 msgid "Incorrect password."
 msgstr "La contrasenya no és correcta."
 
-#: src/protocols/yahoo/yahoo.c:1795
+#: ../src/protocols/yahoo/yahoo.c:2022
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "El vostre compte està blocat, entreu a la web de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: ../src/protocols/yahoo/yahoo.c:2025
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconegut número %d. Això es pot sol·lucionar entrant a la web de "
 "Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1852
+#: ../src/protocols/yahoo/yahoo.c:2079
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-#: src/protocols/yahoo/yahoo.c:1855
+#: ../src/protocols/yahoo/yahoo.c:2082
 msgid "Could not add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
-#: src/protocols/yahoo/ycht.c:415
+#: ../src/protocols/yahoo/yahoo.c:2319 ../src/protocols/yahoo/yahoo.c:2467
+#: ../src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "No s'ha pogut llegir"
 
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
-#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:519
+#: ../src/protocols/yahoo/yahoo.c:2489 ../src/protocols/yahoo/yahoo.c:2610
+#: ../src/protocols/yahoo/yahoo.c:2660 ../src/protocols/yahoo/yahoo.c:2670
+#: ../src/protocols/yahoo/yahoochat.c:1461
+#: ../src/protocols/yahoo/yahoochat.c:1528 ../src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Hi ha un problema de connexió"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
+#: ../src/protocols/yahoo/yahoo.c:2764 ../src/protocols/yahoo/yahoo.c:3131
+#: ../src/protocols/yahoo/yahoo.c:3245
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
+#: ../src/protocols/yahoo/yahoo.c:2766 ../src/protocols/yahoo/yahoo.c:3133
+#: ../src/protocols/yahoo/yahoo.c:3246
 msgid "Not At Desk"
 msgstr "Fora de l'escriptori"
 
-#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
+#: ../src/protocols/yahoo/yahoo.c:2768 ../src/protocols/yahoo/yahoo.c:3135
+#: ../src/protocols/yahoo/yahoo.c:3247
 msgid "Not In Office"
 msgstr "Fora de l'oficina"
 
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
+#: ../src/protocols/yahoo/yahoo.c:2772 ../src/protocols/yahoo/yahoo.c:3139
+#: ../src/protocols/yahoo/yahoo.c:3249
 msgid "On Vacation"
 msgstr "De vacances"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
+#: ../src/protocols/yahoo/yahoo.c:2776 ../src/protocols/yahoo/yahoo.c:3143
+#: ../src/protocols/yahoo/yahoo.c:3251
 msgid "Stepped Out"
 msgstr "Ha marxat"
 
-#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:2857 ../src/protocols/yahoo/yahoo.c:2883
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
-#, fuzzy
-msgid "Appear Online"
-msgstr "Simula estar fora de línia"
-
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "Simula estar fora de línia"
-
-#: src/protocols/yahoo/yahoo.c:2763
-#, fuzzy
-msgid "Stealth"
-msgstr "Estat"
-
-#: src/protocols/yahoo/yahoo.c:2818
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "Simula estar fora de línia"
-
-#: src/protocols/yahoo/yahoo.c:2857
+#: ../src/protocols/yahoo/yahoo.c:2962
 msgid "Join in Chat"
 msgstr "Entra a un xat"
 
-#: src/protocols/yahoo/yahoo.c:2862
+#: ../src/protocols/yahoo/yahoo.c:2967
 msgid "Initiate Conference"
 msgstr "Inicia una conferència"
 
-#: src/protocols/yahoo/yahoo.c:2887
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2920
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Active which ID?"
 msgstr "Quin ID activar?"
 
-#: src/protocols/yahoo/yahoo.c:2929
+#: ../src/protocols/yahoo/yahoo.c:3028
 msgid "Join who in chat?"
 msgstr "A qui us voleu unir al xat?"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: ../src/protocols/yahoo/yahoo.c:3038
 msgid "Activate ID..."
 msgstr "Activa l'ID..."
 
-#: src/protocols/yahoo/yahoo.c:2943
+#: ../src/protocols/yahoo/yahoo.c:3042
 msgid "Join user in chat..."
 msgstr "Entra a un xat d'usuari..."
 
-#: src/protocols/yahoo/yahoo.c:3505
+#: ../src/protocols/yahoo/yahoo.c:3562
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Entra en una sala de xat de la xarxa Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3509
+#: ../src/protocols/yahoo/yahoo.c:3566
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Fa sonar un soroll a un contacte per tal de que us pari atenció"
 
@@ -10870,69 +10911,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
+#: ../src/protocols/yahoo/yahoo.c:3645 ../src/protocols/yahoo/yahoo.c:3647
 msgid "Yahoo Protocol Plugin"
 msgstr "Connector per al protocol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3609
+#: ../src/protocols/yahoo/yahoo.c:3666
 msgid "Yahoo Japan"
 msgstr "Yahoo Japó"
 
-#: src/protocols/yahoo/yahoo.c:3612
+#: ../src/protocols/yahoo/yahoo.c:3669
 msgid "Pager host"
 msgstr "Ordinador del cercapersones"
 
-#: src/protocols/yahoo/yahoo.c:3615
+#: ../src/protocols/yahoo/yahoo.c:3672
 msgid "Japan Pager host"
 msgstr "Ordinador del cercapersones del Japó"
 
-#: src/protocols/yahoo/yahoo.c:3618
+#: ../src/protocols/yahoo/yahoo.c:3675
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
-#: src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3678
 msgid "File transfer host"
 msgstr "Ordinador per transferència de fitxers"
 
-#: src/protocols/yahoo/yahoo.c:3624
+#: ../src/protocols/yahoo/yahoo.c:3681
 msgid "Japan File transfer host"
 msgstr "Port per transferència de fitxers pel Japó"
 
-#: src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3684
 msgid "File transfer port"
 msgstr "Port per transferència de fitxers"
 
-#: src/protocols/yahoo/yahoo.c:3630
-#, fuzzy
+# FIXME: no poso localització perquè l'usuari ho podria
+#        confondre amb "ubicació" (josep)
+#: ../src/protocols/yahoo/yahoo.c:3687
 msgid "Chat Room Locale"
-msgstr "URL de la llista de sales de xat"
-
-#: src/protocols/yahoo/yahoo.c:3633
+msgstr "Característiques locals de la sala de xat"
+
+#: ../src/protocols/yahoo/yahoo.c:3690
 msgid "Chat Room List Url"
 msgstr "URL de la llista de sales de xat"
 
-#: src/protocols/yahoo/yahoo.c:3636
+#: ../src/protocols/yahoo/yahoo.c:3693
 msgid "YCHT Host"
 msgstr "Ordinador YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3639
+#: ../src/protocols/yahoo/yahoo.c:3696
 msgid "YCHT Port"
 msgstr "Port YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: ../src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s no ha acceptat la vostra invitació a unir-se a la sala \"%s\" perquè \"%s"
+"\"."
+
+#: ../src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr "S'ha rebutjat la invitació"
+
+#: ../src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr "No s'ha pogut unir al xat"
+
+#: ../src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr "Pot ser que la sala estigui plena?"
+
+#: ../src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Esteu fent un xat a %s."
+
+#: ../src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "No s'ha pogut entrar al xat de l'amic."
+
+#: ../src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "Potser no estan en cap xat?"
+
+#: ../src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr "No s'ha pogut obtenir la llista de sales."
+
+#: ../src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr "Veus"
+
+#: ../src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "Càmeres web"
+
+#: ../src/protocols/yahoo/yahoochat.c:1461
+#: ../src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr "No s'ha pogut obtenir la llista de sales."
+
+#: ../src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr "Sales d'usuari"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Adreça IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: ../src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! jaopnès"
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: ../src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: ../src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10940,7 +11035,7 @@
 "Els perfils marcats com a que contenen continguts per adults no estan "
 "implementats de moment."
 
-#: src/protocols/yahoo/yahoo_profile.c:800
+#: ../src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10948,48 +11043,47 @@
 "Si voleu veure aquest perfil, haureu de visitar aquest enllaç amb el "
 "navegador"
 
-#: src/protocols/yahoo/yahoo_profile.c:978
+#: ../src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr "ID de Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1052
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/yahoo/yahoo_profile.c:1054
+#: ../src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr "Aficions"
 
-#: src/protocols/yahoo/yahoo_profile.c:1070
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: ../src/protocols/yahoo/yahoo_profile.c:1068
+#: ../src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr "Últimes notícies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1095
+#: ../src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr "Pàgina inicial"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr "Enllaç interessant 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1115
+#: ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr "Enllaç interessant 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1119
+#: ../src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr "Enllaç interessant 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo_profile.c:1130
 msgid "Last Update"
 msgstr "Última actualització"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Dades de l'usuari %s no disponibles"
 
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10997,7 +11091,7 @@
 "Disculpeu, aquest perfil deu estar en llengua que actualment no està "
 "suportada."
 
-#: src/protocols/yahoo/yahoo_profile.c:1160
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11005,7 +11099,7 @@
 "No s'ha pogut obtenir el perfil de l'usuari. Això pot ser degut a un "
 "problema temporal del servidor. Intenteu-ho de nou més tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1163
+#: ../src/protocols/yahoo/yahoo_profile.c:1161
 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 "
@@ -11015,67 +11109,15 @@
 "existeixi, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si "
 "sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1171
+#: ../src/protocols/yahoo/yahoo_profile.c:1169
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
 
-#: src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s no ha acceptat la vostra invitació a unir-se a la sala \"%s\" perquè \"%s"
-"\"."
-
-#: src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "S'ha rebutjat la invitació"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Failed to join chat"
-msgstr "No s'ha pogut unir al xat"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Maybe the room is full?"
-msgstr "Pot ser que la sala estigui plena?"
-
-#: src/protocols/yahoo/yahoochat.c:438
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Esteu fent un xat a %s."
-
-#: src/protocols/yahoo/yahoochat.c:613
-msgid "Failed to join buddy in chat"
-msgstr "No s'ha pogut entrar al xat de l'amic."
-
-#: src/protocols/yahoo/yahoochat.c:614
-msgid "Maybe they're not in a chat?"
-msgstr "Potser no estan en cap xat?"
-
-#: src/protocols/yahoo/yahoochat.c:1350
-msgid "Fetching the room list failed."
-msgstr "No s'ha pogut obtenir la llista de sales."
-
-#: src/protocols/yahoo/yahoochat.c:1403
-msgid "Voices"
-msgstr "Veus"
-
-#: src/protocols/yahoo/yahoochat.c:1406
-msgid "Webcams"
-msgstr "Càmeres web"
-
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-msgid "Unable to fetch room list."
-msgstr "No s'ha pogut obtenir la llista de sales."
-
-#: src/protocols/yahoo/yahoochat.c:1477
-msgid "User Rooms"
-msgstr "Sales d'usuari"
-
-#: src/protocols/yahoo/ycht.c:402
+#: ../src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr "Problema de connexió amb el servidor YCHT."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:327
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -11083,85 +11125,79 @@
 "(S'ha produït un error en convertir aquest missatge. Comproveu l'opció "
 "'Codificació' en l'editor de comptes)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
+#: ../src/protocols/zephyr/zephyr.c:682
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
 msgstr "No s'ha pogut envir el xat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:715 ../src/protocols/zephyr/zephyr.c:1124
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuari:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1129
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Ocult o no connectat"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:724 ../src/protocols/zephyr/zephyr.c:1131
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>A %s des de %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1414 ../src/protocols/zephyr/zephyr.c:1415
 msgid "Anyone"
 msgstr "Qualsevol"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2143
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2149
 msgid "_Instance:"
 msgstr "_Instància:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2155
 msgid "_Recipient:"
 msgstr "Destinata_ri:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2166
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "No s'ha pogut subscriure a %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2471
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Localitza usuari"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2476
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Localitza usuari"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2481
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
 "classe"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2486
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
 "classe"
 
-#: src/protocols/zephyr/zephyr.c:2622
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topic &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
-"classe"
-
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2492
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classe&gt; &lt;instància&gt; &lt;destinatari&gt;: Entra a un altre "
 "xat"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2497
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instància&gt;: Envia el missatga a &lt;missatge,<i>instància</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2503
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11169,7 +11205,7 @@
 "zci &lt;classe&gt; &lt;instància&gt;: Send un missatge a &lt;<i>classe</i>,"
 "<i>instància</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2509
 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;"
@@ -11177,7 +11213,7 @@
 "zcir &lt;classe&gt; &lt;instància&gt; &lt;destinatari&gt;: Envia un missatge "
 "a &lt;<i>classe</i>,<i>instància</i>,<i>destinatari</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11185,16 +11221,16 @@
 "zir &lt;instància&gt; &lt;destinatari&gt;: Envia un missatge a &lt;MISSATGE,"
 "<i>instància</i>,<i>destinatari</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2520
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;: Envia un missatge a &lt;<i>classe</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2626
 msgid "Resubscribe"
 msgstr "Dessubscriu"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2629
 msgid "Retrieve subscriptions from server"
 msgstr "Recupera les subscripcions del servidor"
 
@@ -11208,53 +11244,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2712 ../src/protocols/zephyr/zephyr.c:2714
 msgid "Zephyr Protocol Plugin"
 msgstr "Connector per al protocol Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2739
 msgid "Export to .anyone"
 msgstr "Exporta a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2742
 msgid "Export to .zephyr.subs"
 msgstr "Exporta a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-msgid "Import from .anyone"
-msgstr "Importa de .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-msgid "Import from .zephyr.subs"
-msgstr "Importa de .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-msgid "Realm"
-msgstr "Regne"
-
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2745
 msgid "Exposure"
 msgstr "Exposició"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1038
+#: ../src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "S'ha denegat l'accés: el servidor intermediari prohibeix la tunelització del "
 "port %d"
 
-#: src/proxy.c:1042
+#: ../src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Error en la connexió al servidor intermediari %d"
 
-#: src/proxy.c:1876
+#: ../src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr "Opcions del servidor intermediari invàlides"
 
-#: src/proxy.c:1876
+#: ../src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11262,381 +11286,177 @@
 "O bé el nom de l'ordinador o bé el número del port especificat per al tipus "
 "de servidor intermediari indicat són invàlids."
 
+#. * Custom away message.
+#: ../src/prpl.h:187
+msgid "Custom"
+msgstr "Personalitzat"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1276
+#: ../src/request.h:1255
 msgid "Accept"
 msgstr "Accepta"
 
-#: src/server.c:351
+#: ../src/server.c:64
+msgid "Please enter your password"
+msgstr "Entreu la contrasenya"
+
+#: ../src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ara es fa dir %s\n"
 
-#: src/server.c:733
+#: ../src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d missatge)"
 msgstr[1] "(%d missatges)"
 
-#: src/server.c:747
+#: ../src/server.c:992
 msgid "(1 message)"
 msgstr "(1 missatge)"
 
-#: src/server.c:1008
-#, fuzzy, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr "%s ha convidat a %s a la sala de xat %s\n"
-
-#: src/server.c:1013
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ha convidat a %s a la sala de xat %s\n"
-
-#: src/server.c:1017
-msgid "Accept chat invitation?"
-msgstr "Voleu acceptar la invitació del xat?"
-
-#: src/status.c:153
-msgid "Unset"
-msgstr "Sense especificar"
-
-#: src/status.c:626
+#: ../src/server.c:1215 ../src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s ha entrat."
+
+#: ../src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr "%s s'ha connectat"
+
+#: ../src/server.c:1251
 #, c-format
 msgid "%s came back"
 msgstr "%s ha tornat"
 
-#: src/status.c:631
+#: ../src/server.c:1253
 #, c-format
 msgid "%s went away"
 msgstr "%s ha passat a absent"
 
-#: src/status.c:1314
+#: ../src/server.c:1267
 #, c-format
 msgid "%s became idle"
 msgstr "%s ha passat a inactiu"
 
-#: src/status.c:1330
+#: ../src/server.c:1278
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ja no està inactiu"
 
-#: src/util.c:2120
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error en llegir %s"
-
-#: src/util.c:2121
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr ""
-"S'ha produït un error en analitzar la vostra llista d'amics. No s'ha "
-"carregat, i s'ha reanomenat el fitxer antic com a blist.xml~."
-
-#: src/util.c:2558
+#: ../src/server.c:1288 ../src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s ha sortit."
+
+#: ../src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr "%s se n'ha anat"
+
+#: ../src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s acaba de ser avisat per %s.\n"
+"El seu nivell d'avisos és ara %d%%"
+
+#: ../src/server.c:1373
+msgid "an anonymous person"
+msgstr "una persona anònima"
+
+#: ../src/server.c:1487
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s ha convidat a %s a la sala de xat %s:\n"
+"<b>%s</b>"
+
+#: ../src/server.c:1493
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s ha convidat a %s a la sala de xat %s\n"
+
+#: ../src/server.c:1502
+msgid "Accept chat invitation?"
+msgstr "Voleu acceptar la invitació del xat?"
+
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: ../src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "Disculpeu-me, me n'he anat per una estona."
+
+#: ../src/stock.c:87
+msgid "_Alias"
+msgstr "À_lies"
+
+#: ../src/stock.c:89
+msgid "_Invite"
+msgstr "Conv_ida"
+
+#: ../src/stock.c:90
+msgid "_Modify"
+msgstr "_Modifica"
+
+#: ../src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Obre el correu"
+
+#: ../src/stock.c:93
+msgid "_Warn"
+msgstr "_Avisa"
+
+#: ../src/util.c:2408
 msgid "Calculating..."
 msgstr "S'està calculant..."
 
-#: src/util.c:2561
+#: ../src/util.c:2411
 msgid "Unknown."
 msgstr "Desconegut."
 
-#: src/util.c:2591
+#: ../src/util.c:2441
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segon"
 msgstr[1] "segons"
 
-#: src/util.c:2605
+#: ../src/util.c:2455
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: src/util.c:2613
+#: ../src/util.c:2463
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/util.c:2621
+#: ../src/util.c:2471
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/util.c:3041
+#: ../src/util.c:2891
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error en obrir la connexió.\n"
 
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Recupera l'estat d'absent en tornar a connectar"
-
-#~ msgid "Mail Server"
-#~ msgstr "Servidor de correu"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nous/%d total)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Comprova el correu"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Comprova el correu electrònic cada X segons.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Connexió automàtica"
-
-#~ msgid "Signoff"
-#~ msgstr "Desconnecta"
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "Comprovació de senyals GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr ""
-#~ "Prova per veure si tots els senyals de la interfície d'usuari funcionen "
-#~ "correctament."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Quan s'obri una nova conversa aquest connector inserirà la darrera "
-#~ "conversa en la conversa actual."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Posa la llista d'amics aco_blable sempre per sobre"
-
-#~ msgid "Away!"
-#~ msgstr "Absent."
-
-#~ msgid "Edit This Message"
-#~ msgstr "Edita aquest missatge"
-
-#~ msgid "I'm Back!"
-#~ msgstr "He tornat."
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Esteu segur que voleu suprimir el missatge d'absència \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Suprimeix el missatge d'absència"
-
-#~ msgid "Set All Away"
-#~ msgstr "Passa'ls tots a absent"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "No es pot desar un missatge d'absència amb un títol en blanc"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Indiqueu un títol per al missatge, o escolliu \"Usa\" per usar-lo sense "
-#~ "desar."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "No es pot crear un missatge d'absència buit"
-
-#~ msgid "New away message"
-#~ msgstr "Missatge d'absència nou"
-
-#~ msgid "Away title: "
-#~ msgstr "Motiu de l'absència: "
-
-#~ msgid "_Save"
-#~ msgstr "De_sa"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Desa i _fes servir"
-
-#~ msgid "_Use"
-#~ msgstr "_Usa"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Error en la llista d'amics"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Mostra menys opcions"
-
-#~ msgid "Information"
-#~ msgstr "Informació"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Amics/_Desconnecta"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Eines/_Absent"
-
-#~ msgid "Rename Group"
-#~ msgstr "Reanomena el grup"
-
-#~ msgid "New group name"
-#~ msgstr "Nom de grup nou"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Entreu un nou nom per al grup seleccionat."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Compte:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inactiu:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Avisat:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Avisat (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Eines/Absent"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Envia un missatge a l'amic seleccionat"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Obtingues dades sobre l'amic seleccionat"
-
-#~ msgid "_Chat"
-#~ msgstr "_Xat"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Entra a una sala"
-
-#~ msgid "_Away"
-#~ msgstr "_Absent"
-
-#~ msgid "Set an away message"
-#~ msgstr "Estableix un missatge d'absència"
-
-#~ msgid "Done."
-#~ msgstr "Fet."
-
-#~ msgid "Signon: "
-#~ msgstr "Connexió: "
-
-#~ msgid "Signon"
-#~ msgstr "Connexió"
-
-#~ msgid "Cancel All"
-#~ msgstr "Cancel·la-ho tot"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Obtingues el missatge d'absència"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversa/_Avisa..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversa/Avisa..."
-
-#~ msgid "Warn"
-#~ msgstr "Avisa"
-
-#~ msgid "Warn the user"
-#~ msgstr "Avisa l'usuari"
-
-#~ msgid "Block the user"
-#~ msgstr "Bloca l'usuari"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Envia un fitxer a l'usuari"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Afegeix l'usuari a la llista d'amics"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Suprimeix l'usuari de la llista d'amics"
-
-#~ msgid "Send"
-#~ msgstr "Envia"
-
-#~ msgid "Send message"
-#~ msgstr "Envia el missatge"
-
-#~ msgid "Invite"
-#~ msgstr "Convida"
-
-#~ msgid "Invite a user"
-#~ msgstr "Convida un usuari"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Afegeix el xat a la llista d'amics"
-
-#~ msgid "Remove the chat from your buddy list"
-#~ msgstr "Suprimeix l'usuari de la llista d'amics"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversa/Tanca"
-
-#~ msgid "former lead developer"
-#~ msgstr "antic desenvolupador principal"
-
-#~ msgid "former maintainer"
-#~ msgstr "antic mantenidor"
-
-#~ msgid "Burmese"
-#~ msgstr "Birmà"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanès"
-
-#~ msgid "Turkish"
-#~ msgstr "Turc"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraïnès"
-
-#~ msgid "Chinese"
-#~ msgstr "Xinès"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Nom d'usuari:"
-
-#~ msgid "Warn User"
-#~ msgstr "Avisa l'usuari"
-
-#~ 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\">Voleu avisar a %s?</span>\n"
-#~ "\n"
-#~ "Això incrementarà el nivell d'avís de %s i estarà subjecte a una "
-#~ "limitació de velocitat més estricta.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Voleu _avisar anònimament?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Els avisos anònims són menys estrictes.</b>"
+#~ msgid "/Conversation/A_lias..."
+#~ msgstr "/Conversa/À_lies..."
+
+#~ msgid "/Options/Show T_imestamps"
+#~ msgstr "/Opcions/Mostra marques de _temps"
 
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
@@ -11645,265 +11465,6 @@
 #~ "No ha estat possible descobrir el tipus d'imatge a partir de l'extensió "
 #~ "del fitxer. S'agafarà PNG com a predeterminat."
 
-#~ msgid "Interface Options"
-#~ msgstr "Opcions de la interfície"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Mostra els sobrenoms remots s_i no se'ls ha establert cap àlies"
-
-#~ msgid "Display"
-#~ msgstr "Visualitza"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Mos_tra marques horàries en els missatges"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignora _colors"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignora _tipus de lletra"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignora la _mida de la lletra"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Formatació per defecte"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Envia la formatació per defecte per als missatges sortints"
-
-#~ msgid "Send Message"
-#~ msgstr "Enviament dels missatges"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "La tecla de _retorn envia el missatge"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "La c_ombinació de tecles control-retorn envia el missatge"
-
-#~ msgid "Window Closing"
-#~ msgstr "Tancament de les finestres"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "La tecla d'_escapament tanca la finestra"
-
-#~ msgid "Insertions"
-#~ msgstr "Insercions"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U/S} canvia la _formatació"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(nombre) _insereix emoticones"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Mostra els _botons com a:"
-
-#~ msgid "Pictures"
-#~ msgstr "Imatges"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Imatges i text"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Alça les finestres en rebre-hi esdeveniments"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Mostra nivells d'_avís"
-
-#~ msgid "Show idle _times"
-#~ msgstr "Mostra _temps inactiu"
-
-#~ msgid "Dim i_dle buddies"
-#~ msgstr "Enfosqueix els amics inactius"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "Expandeix _automàticament els contactes"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Habilita les ordre_s \"barra inversa\""
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Mostr_a els àlies a les pestanyes/títols"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Alça les finestres de MI en _rebre-hi esdeveniments"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Alça les finestres de _xat en rebre-hi esdeveniments"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Fes servir àlies _multicolors en els xats"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Situació de _les pestanyes:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "_Posicionament d'una nova conversa:"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edita"
-
-#~ msgid "Interface"
-#~ msgstr "Interfície"
-
-#~ msgid "Message Text"
-#~ msgstr "Text del missatge"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Dreceres"
-
-#~ msgid "Away Messages"
-#~ msgstr "Missatges d'absència"
-
-#~ msgid "Please create an account."
-#~ msgstr "Creeu un compte."
-
-#~ msgid "Login"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Compte:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>C_ontrasenya:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Comptes"
-
-#~ msgid "P_references"
-#~ msgstr "P_referències"
-
-#~ msgid "_Sign on"
-#~ msgstr "Co_nnecta"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Ús: %s [OPCIÓ]...\n"
-#~ "\n"
-#~ "  -a, --acct             mostra la finestra d'edició de comptes\n"
-#~ "  -w, --away[=MISSATGE]  entra com a absent quan es connecta\n"
-#~ "                         (l'argument opcional MISSATGE especifica el "
-#~ "missatge\n"
-#~ "                         d'absència a mostrar)\n"
-#~ "  -l, --login[=NOM]      connexió automàtica (l'argument opcional NOM\n"
-#~ "                         especifica els comptes a usar, separats per "
-#~ "comes)\n"
-#~ "  -n, --loginwin         no es connecta automàticament; mostra la "
-#~ "finestra\n"
-#~ "                         de connexió\n"
-#~ "  -u, --user=NOM         usa el compte NOM\n"
-#~ "  -c, --config=DIR       utilitza DIR per a fitxers de configuració\n"
-#~ "  -d, --debug            escriu els missatges de depuració a la sortida\n"
-#~ "                         estàndard\n"
-#~ "  -v, --version          mostra la versió i surt\n"
-#~ "  -h, --help             mostra aquesta ajuda i surt\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "No s'han pogut carregar les preferències"
-
-#~ 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 ""
-#~ "El Gaim no ha pogut carregar les vostres preferències perquè estan "
-#~ "desades en un format antic que ja no es fa servir. Reconfigureu els "
-#~ "vostres paràmetres en la finestra de preferències."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim ha trobat un error en la comunicació amb el servidor ICQ."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu."
-
-#~ msgid "Send message through server"
-#~ msgstr "Envia el missatge a través del servidor"
-
-#~ msgid "Connecting..."
-#~ msgstr "S'està connectant..."
-
-#~ msgid "Nick:"
-#~ msgstr "Sobrenom:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Usuari de Gaim"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "S'ha cancel·lat la transferència de fitxers"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Error en la llista de sales"
-
-#~ msgid "Logged out"
-#~ msgstr "Desconnectat"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Oculta el sistema operatiu"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "L'usuari %s vol afegir-vos a la seva llista d'amics."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Mostra notícies tancades de la conversa"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Mostra notificacions de temps excedit"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "La conversa ha esdevingut inactiva i el temps ha expirat."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Se us ha desconnectat del servidor perquè heu entrat des d'un altre lloc"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Se us ha desconnectat perquè us heu connectat amb el mateix nom des d'un "
-#~ "altre lloc."
-
-#~ msgid "Not specified"
-#~ msgstr "No especificat"
-
-#~ msgid "Visible"
-#~ msgstr "Visible"
-
-#~ msgid "Available Message:"
-#~ msgstr "Missatge de disponibilitat:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Estic fent feina i espero una distracció; parleu amb mi."
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Estableix el missatge de disponibilitat..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Ha fallat en sortir del canal"
-
 # DUBTE
 #~ msgid "Default SILC Key Pair"
 #~ msgstr "Joc de claus per defecte del SILC"
@@ -11914,66 +11475,320 @@
 #~ msgid "SILC Private Key"
 #~ msgstr "Clau privada SILC"
 
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Se us ha desconnectat ja que us heu connectat de d'un altre ordinador o "
-#~ "dispositiu."
-
-#~ msgid "Custom"
-#~ msgstr "Personalitzat"
-
-#~ msgid "Please enter your password"
-#~ msgstr "Entreu la constrasenya"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s ha entrat."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s s'ha connectat"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s se n'ha anat"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s acaba de ser avisat per %s.\n"
-#~ "El seu nivell d'avisos és ara %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "una persona anònima"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s ha convidat a %s a la sala de xat %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Disculpeu-me, me n'he anat per una estona."
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "Oculta el quadre de diàleg de reconnexió"
 
 #~ msgid "Log Out"
 #~ msgstr "Desconnecta"
 
+#~ msgid "Cursor Color"
+#~ msgstr "Color del cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundari del cursor"
+
+#~ msgid "Hyperlink Color"
+#~ msgstr "Color dels hiperenllaços"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "Mida de l'expansor del GTkTreeView"
+
+#~ msgid "Conversation Entry"
+#~ msgstr "Entrada de la conversa"
+
+#~ msgid "Conversation History"
+#~ msgstr "Històric de converses"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Visualitzador del registre"
+
+#~ msgid "Request Dialog"
+#~ msgstr "Diàleg de sol·licitud"
+
+#~ msgid "Notify Dialog"
+#~ msgstr "Diàleg de notificació"
+
+#~ msgid "Select Color for %s"
+#~ msgstr "Selecciona el color per a %s"
+
+#~ msgid "Select Color"
+#~ msgstr "Selecciona el color per a %s"
+
+#~ msgid "Select Font for %s"
+#~ msgstr "Selecciona el tipus de lletra per a %s"
+
+#~ msgid "Select Interface Font"
+#~ msgstr "Selecciona el tipus de lletra de la interfície"
+
+#~ msgid "Gtk interface font"
+#~ msgstr "Tipus de lletra de la interfície Gtk"
+
+#~ msgid "Gtk text shortcut theme"
+#~ msgstr "Tema de la drecera de text de Gtk"
+
+#~ msgid "Gaim GTK+ Theme Control"
+#~ msgstr "Control de temes GTK+ del Gaim"
+
+#~ msgid "Provides access to commonly used gtkrc settings."
+#~ msgstr "Proporciona accés a peràmetres del gtkrc utilitzats habitualment ."
+
+#~ msgid "R_aise conversation window"
+#~ msgstr "_Alça la finestra de conversa"
+
+#~ msgid "accounts"
+#~ msgstr "comptes"
+
+#~ msgid "buddy list"
+#~ msgstr "llista d'amics"
+
+#~ msgid "Enter Password"
+#~ msgstr "Introduïu la contrasenya"
+
+#~ msgid "Unable to send message to %s."
+#~ msgstr "No s'ha pogut enviar el missatge a %s."
+
 #~ msgid "Unable to send messge to %s."
 #~ msgstr "No s'ha pogut enviar el missatge a %s."
 
+#~ msgid ""
+#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
+#~ "greater than 9999 chars\n"
+#~ msgstr ""
+#~ "No hi ha prou arguments (-t, -f, -p, i -m en requereixen) o els arguments "
+#~ "contenen més de 9999 caràcters\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Log out all accounts\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Desconnecta tots els comptes\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Send instant message\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Envia missatge instantani\n"
+
+#~ msgid "Enabled"
+#~ msgstr "Habilitat"
+
+#~ msgid "/Tools/Mute Sounds"
+#~ msgstr "/Eines/Inhabilita els sons"
+
 #~ msgid "/Buddies/_Log Out"
 #~ msgstr "/Amics/_Desconnecta"
 
+#~ msgid "/Tools/_Statuses"
+#~ msgstr "/Eines/_Estats"
+
+#~ msgid "/Tools/Mute _Sounds"
+#~ msgstr "/Eines/Inhabilita els _sons"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Inactiu:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Last Seen:</b> %s ago"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Vist per darrera vegada:</b> fa %s"
+
+#~ msgid "Idle "
+#~ msgstr "Inactiu "
+
+#~ msgid "/Buddies/New Instant Message..."
+#~ msgstr "/Amics/Missatge instantani nou..."
+
+#~ msgid "/Buddies/Get User Info..."
+#~ msgstr "/Amics/Obtingues informació de l'usuari..."
+
+#~ msgid "/Buddies/Add Buddy..."
+#~ msgstr "/Amics/Afegeix un amic..."
+
+#~ msgid "/Buddies/Add Chat..."
+#~ msgstr "/Amics/Afegeix un xat..."
+
+#~ msgid "/Buddies/Add Group..."
+#~ msgstr "/Amics/Afegeix un grup..."
+
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "/Amics/Desconnecta"
 
+#~ msgid "Disconnected"
+#~ msgstr "Desconnectat"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opcions/Mostra la icona de l'amic"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Options/Mostra la icona de l'amic"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, seperated by commas)\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "Gaim %s\n"
+#~ "Forma d'ús: %s [OPTCIÓ]...\n"
+#~ "\n"
+#~ "  -a, --acct          mostra la finestra d'edició de comptes\n"
+#~ "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
+#~ "  -d, --debug         mostra missatges de depuració a la sortida "
+#~ "estàndard\n"
+#~ "  -h, --help          mostra aquesta ajuda i surt\n"
+#~ "  -n, --nologin       no entra automàticament\n"
+#~ "  -l, --login[=NOM]   entra automàticament (l'argument opcional NOM "
+#~ "indica els\n"
+#~ "                      comptes a fer servir, separats per comes)\n"
+#~ "  -v, --version       mostra la versió actual i surt\n"
+
 #~ msgid "Ignore _formatting"
 #~ msgstr "Ignora el _formatat"
 
+#~ msgid "Show more buddy details"
+#~ msgstr "Mostra mésdetalls de l'amic"
+
+#~ msgid "No sounds"
+#~ msgstr "Sense sons"
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
+
+#~ msgid "Saved Statuses"
+#~ msgstr "Estats desats"
+
+#~ msgid "Title already in use.  You must choose a unique title."
+#~ msgstr "Ja s'utilitza aquest títol. Heu d'escollir un títol únic."
+
+#~ msgid "Custom status"
+#~ msgstr "Estat personalitzat"
+
+#~ msgid "_Title:"
+#~ msgstr "_Títol:"
+
+#~ msgid "Out of the office"
+#~ msgstr "Fora de l'oficina"
+
+#~ msgid "_Status:"
+#~ msgstr "E_stat:"
+
+#~ msgid "Use a different status for some accounts"
+#~ msgstr "Utilitza un estat diferent per a determinats comptes"
+
+#~ msgid "Typing"
+#~ msgstr "Teclejant"
+
+#~ msgid "New Status"
+#~ msgstr "Estat nou"
+
+#~ msgid "The following error has occurred loading %s: %s"
+#~ msgstr "S'ha produït el següent error en carregar %s: %s"
+
+#~ msgid "Failed to load image"
+#~ msgstr "No s'ha pogut carregar la imatge"
+
+#~ msgid "Cannot send folder %s."
+#~ msgstr "No s'ha pogut enviar la carpeta %s."
+
+#~ msgid ""
+#~ "Gaim cannot transfer a folder. You will need to send the files within "
+#~ "individually"
+#~ msgstr ""
+#~ "El Gaim no pot transferir una carpeta. Haureu d'enviar per separat cada "
+#~ "un dels fitxers"
+
+#~ msgid "You have dragged an image"
+#~ msgstr "Heu arrossegat una imatge"
+
+#~ 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 ""
+#~ "Podeu enviar aquesta imatge com una transferència de fitxer, incrustar-la "
+#~ "en el missatge, o usar-la com a icona d'amic per a aquest usuari."
+
+#~ msgid "Set as buddy icon"
+#~ msgstr "Estableix com a icona de l'amic"
+
+#~ msgid "Send image file"
+#~ msgstr "Envia unfitxer d'imatge"
+
+#~ msgid "Insert in message"
+#~ msgstr "Insereix un el missatge"
+
+#~ msgid "Would you like to set it as the buddy icon for this user?"
+#~ msgstr "Voleu establir-la com la icona per a aquest amic?"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer orembed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Podeu enviar aquesta imatge com a una transferència de fitxer, incrustar-"
+#~ "la en el missatge o utilitzar-la com a icona per a aquest usuari."
+
+#~ msgid ""
+#~ "You can insert this image into this message, or use it as the buddy icon "
+#~ "for this user"
+#~ msgstr ""
+#~ "Podeu incrustar aquesta imatge en el missatge o utilitzar-la com a icona "
+#~ "per a aquest usuari."
+
+#~ msgid "Cannot send launcher"
+#~ msgstr "No es pot enviar el llançador"
+
+#~ msgid ""
+#~ "You dragged a desktop launcher. Most likely you wanted to send whatever "
+#~ "this launcher points to instead of this launcher itself."
+#~ msgstr ""
+#~ "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò "
+#~ "al que aquest llançador apunta i no pas el llançador."
+
+#~ msgid "Use SSL"
+#~ msgstr "Usa SSL"
+
+#~ msgid "Priority"
+#~ msgstr "Prioritat"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Heu perdut la connexió a la sala de xat %s."
+
+#~ msgid "Require authorization"
+#~ msgstr "Requereix autorització"
+
+#~ msgid "Hide IP address"
+#~ msgstr "Ocula l'adreça IP"
+
+#~ msgid "Web aware"
+#~ msgstr "Conscient de la web"
+
+#~ msgid "ICQ Privacy Options"
+#~ msgstr "Opcions de privadesa de ICQ"
+
+#~ msgid "Show privacy options..."
+#~ msgstr "Mostra les opcions de privadesa..."
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "Usa el grup d'amics recent"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Mostra quant de temps heu estat inactiu"
+
 #~ msgid ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 #~ "(1,048,576 bytes)."
@@ -11981,6 +11796,26 @@
 #~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un "
 #~ "Megabyte (1.048.576 bytes)."
 
+#~ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+#~ msgstr ""
+#~ "topic &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
+#~ "classe"
+
+#~ msgid "Import from .anyone"
+#~ msgstr "Importa de .anyone"
+
+#~ msgid "Import from .zephyr.subs"
+#~ msgstr "Importa de .zephyr.subs"
+
+#~ msgid "Realm"
+#~ msgstr "Regne"
+
+#~ msgid "Unset"
+#~ msgstr "Sense especificar"
+
+#~ msgid "Error Reading %s"
+#~ msgstr "Error en llegir %s"
+
 #~ msgid "Miscellaneous error"
 #~ msgstr "Error miscel·lani"
 
@@ -11999,7 +11834,7 @@
 #~ msgstr "S'està sol·licitant d'enviar la contrasenya"
 
 #~ msgid "Syncing with server"
-#~ msgstr "S'está sincronitzant amb el servidor"
+#~ msgstr "S'està sincronitzant amb el servidor"
 
 #~ msgid "Unable to connect to %s server"
 #~ msgstr "No s'ha pogut conectar al servidor %s"