diff --git a/po/ChangeLog b/po/ChangeLog
index b183a8b391eba9cbd95ee07b7599ac04a67a1089..68ce026f4c2af3986f59c1e2bddf88b5f444b2a1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-13 Pau Rul·lan Ferragut <paurullan@bulma.net>
+	
+	* ca.po: Update catalan translation by Carles Muñoz Gorriz
+	<carlesmu@internautas.org>
+
 2006-05-13 Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
 
 	* zh_TW: Update traditional Chinese translation.
@@ -12,7 +17,6 @@
 	* pl.po: Updated Polish translations by Szymon Kalasz
 	  <szymon_maestro@gazeta.pl>.
 
->>>>>>> .r21637
 2006-05-07  Daichi Kawahata <daichi@xfce.org>
 
 	* pl.po: Updated Polish translations by Piotr Malinski
diff --git a/po/ca.po b/po/ca.po
index f2a281c561d10ece983d2ca56ace121a2a66ba1f..051f6a0bb8c54505bc74ccdaeb8c7748871b09ab 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,275 +1,249 @@
 # translation of ca.po to Catalan
-# Window manager for XFce desktop environment.
+# Window manager for Xfce desktop environment.
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
 #
-# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2003, 2004.
+# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2003-2004, 2006
 # Pau Rul·lan Ferragut <paurullan@bulma.net> 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-07 19:48+0200\n"
-"PO-Revision-Date: 2006-04-02 21:25+0200\n"
-"Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
+"PO-Revision-Date: 2006-05-13 20:27+0100\n"
+"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #: ../mcs-plugin/margins.c:130
-#, fuzzy
 msgid "Workspace Margins"
 msgstr "Marges dels espais de treball"
 
 #: ../mcs-plugin/margins.c:136
-#, fuzzy
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
-msgstr "Marges on   de   pantalla no finestra"
+msgstr ""
+"Els marges són uns espais a les vores de la pantalla on no s'emplaçarà cap "
+"finestra"
 
 #: ../mcs-plugin/margins.c:167
-#, fuzzy
 msgid "Left :"
-msgstr "Esquerra:"
+msgstr "Esquerre:"
 
 #: ../mcs-plugin/margins.c:187
-#, fuzzy
 msgid "Right :"
-msgstr "Dreta:"
+msgstr "Dret:"
 
 #: ../mcs-plugin/margins.c:207
-#, fuzzy
 msgid "Top :"
-msgstr "Principi:"
+msgstr "Superior:"
 
 #: ../mcs-plugin/margins.c:227
-#, fuzzy
 msgid "Bottom :"
 msgstr "Inferior:"
 
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/workspaces_plugin.c:110
-#, fuzzy
 msgid "Button Label|Workspaces and Margins"
-msgstr "Àrees de treball i Marges"
+msgstr ""
+"Espais de treball\n"
+"i marges"
 
 #: ../mcs-plugin/workspaces_plugin.c:144
-#, fuzzy
 msgid "Workspaces and Margins"
-msgstr "Àrees de treball i Marges"
+msgstr "Espais de treball i marges"
 
 #: ../mcs-plugin/workspaces_plugin.c:162 ../mcs-plugin/wmtweaks_plugin.c:498
 #: ../mcs-plugin/workspaces.c:516
-#, fuzzy
 msgid "Workspaces"
-msgstr "Àrees de treball"
+msgstr "Espais de treball"
 
 #: ../mcs-plugin/workspaces_plugin.c:171
-#, fuzzy
 msgid "Margins"
 msgstr "Marges"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:356
 msgid "None"
-msgstr ""
+msgstr "Cap"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:364
 #: ../mcs-plugin/xfce-wmtweaks-settings.desktop.in.h:2
 #, fuzzy
 msgid "Window Manager Tweaks"
-msgstr "Finestra Gestor"
+msgstr "Ajustaments avançats del gestor de finestres"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:383
 msgid ""
 "Include windows that have \"skip pager\" or \"skip taskbar\" properties set"
 msgstr ""
+"Inclou les finestres que tinguin la propietat «omet paginador» o «omet barra "
+"de tasques» activada."
 
 #: ../mcs-plugin/wmtweaks_plugin.c:389
-#, fuzzy
 msgid "Include hidden (i.e. iconified) windows"
-msgstr "Inclou ocult e finestres"
+msgstr "Inclou les finestres amagades (i.e. les iconificades)"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:395
-#, fuzzy
 msgid "Cycle through windows from all workspaces"
-msgstr "Cicle finestres de all"
+msgstr "Inclou les finestres dels altres espais de treball"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:400
 msgid "Cycling"
-msgstr ""
+msgstr "Rotació"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:412
-#, fuzzy
 msgid "Activate focus stealing prevention"
-msgstr "Activa"
+msgstr "Activa la prevenció de furt de l'enfocament"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:418
-#, fuzzy
 msgid "Honor the standard ICCCM focus hint"
-msgstr " "
+msgstr "Fes cas de la senyal ICCCM d'enfocament"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:423 ../mcs-plugin/xfwm4_plugin.c:1695
-#, fuzzy
 msgid "Focus"
-msgstr "Focus"
+msgstr "Enfocament"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:435
-#, fuzzy
 msgid "Key used to grab and move windows"
-msgstr "Utilitza   a  i finestres"
+msgstr "Tecla emprada per arrossegar i moure finestres"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:441
-#, fuzzy
 msgid "Raise windows when any mouse button is pressed"
-msgstr "Puja finestres qualsevol ratolí és premut"
+msgstr "Coŀloca en primer pla quan es pitgi qualsevol botó del ratolí"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:448
-#, fuzzy
 msgid "Restore original size of maximized windows when moving"
-msgstr "Restaura mida de finestres"
+msgstr "Restaura la mida original de les finestres maximitzades quan es mouen"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:454
 #, fuzzy
 msgid "Use edge resistance instead of windows snapping"
-msgstr "Utilitza de finestres"
+msgstr ""
+"Empra resistència a les vores en lloc de l'alineació ràpida de finestres"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:459
-#, fuzzy
 msgid "Accessibility"
 msgstr "Accessibilitat"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:472
-#, fuzzy
 msgid "Switch workspaces using the mouse wheel over the desktop"
-msgstr "Commuta utilitzant   ratolí  "
+msgstr ""
+"Canvia d'espai de treball mitjançant la roda del ratolí sobre l'escriptori"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:479
 msgid ""
 "Remember and recall previous workspace when switching via keyboard shortcuts"
 msgstr ""
+"Recorda i recrida l'espai de treball previ quan canvii mitjançant les "
+"dreceres de tecles"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:486
-#, fuzzy
 msgid "Wrap workspaces depending on the actual desktop layout"
-msgstr "Ajusta on  "
+msgstr "Canvia d'espai de treball en funció del format actual de l'escriptori"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:493
-#, fuzzy
 msgid "Wrap workspaces when the first or last workspace is reached"
-msgstr "Ajusta   primer o últim l'àrea de treball és"
+msgstr "Canvia d'espai de treball quan s'arribi al primer o últim"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:510
-#, fuzzy
 msgid "Minimum size of windows to trigger smart placement"
-msgstr "Valor mí~nim mida de finestres a "
+msgstr "Mida mínima de les finestres per emplaçar-les «inteŀligentment»"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:511
-#, fuzzy
 msgid "Size|Small"
 msgstr "Petit"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:511
-#, fuzzy
 msgid "Size|Large"
 msgstr "Gran"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:515
-#, fuzzy
 msgid "Placement"
-msgstr "Elegant"
+msgstr "Emplaçament"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:534
-#, fuzzy
 msgid "Show shadows under regular windows"
-msgstr "Mostra finestres"
+msgstr "Mostra ombres a les finestres normals"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:540
-#, fuzzy
 msgid "Show shadows under popup windows"
-msgstr "Mostra emergent finestres"
+msgstr "Mostra ombres a les finestres emergents"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:546
-#, fuzzy
 msgid "Opacity of window decorations"
-msgstr "Opacitat de finestra"
+msgstr "Opacitat de la decoració de les finestres"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:546 ../mcs-plugin/wmtweaks_plugin.c:552
 #: ../mcs-plugin/wmtweaks_plugin.c:558 ../mcs-plugin/wmtweaks_plugin.c:564
-#, fuzzy
 msgid "Transparent"
 msgstr "Transparent"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:547 ../mcs-plugin/wmtweaks_plugin.c:553
 #: ../mcs-plugin/wmtweaks_plugin.c:559 ../mcs-plugin/wmtweaks_plugin.c:565
-#, fuzzy
 msgid "Opaque"
-msgstr "Opac"
+msgstr "Opacitat"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:552
-#, fuzzy
 msgid "Opacity of windows during move"
-msgstr "Opacitat de finestres"
+msgstr "Opacitat de les finestres al moure-les"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:558
-#, fuzzy
 msgid "Opacity of windows during resize"
-msgstr "Opacitat de finestres"
+msgstr "Opacitat de les finestres al redimensinar-les"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:564
-#, fuzzy
 msgid "Opacity of popup windows"
-msgstr "Opacitat de emergent finestres"
+msgstr "Opacitat de les finestres emergents"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:569
 #, fuzzy
 msgid "Compositor"
-msgstr "Nou missatge drecera"
+msgstr "«Compositor»"
 
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/wmtweaks_plugin.c:610
 #, fuzzy
 msgid "Button Label|Window Manager Tweaks"
-msgstr "Finestra Gestor"
+msgstr ""
+"Gestor de finestres,\n"
+"ajustaments avançats"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:725 ../mcs-plugin/xfwm4_plugin.c:2356
 #, c-format
 msgid "These settings cannot work with your current window manager (%s)"
 msgstr ""
+"Aquests paràmetres no poden funcionar amb el vostre gestor de finestres (%s)"
 
 #: ../mcs-plugin/workspaces.c:329
-#, fuzzy
 msgid "Change name"
 msgstr "Canvia el nom"
 
 #: ../mcs-plugin/workspaces.c:338 ../mcs-plugin/xfwm4_shortcuteditor.c:470
-#, fuzzy, c-format
+#, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
 #: ../mcs-plugin/workspaces.c:348
-#, fuzzy
 msgid "Name:"
 msgstr "Nom:"
 
 #: ../mcs-plugin/workspaces.c:427
-#, fuzzy
 msgid "Click on a workspace name to edit it"
-msgstr "Feu clic on a l'àrea de treball nom a  edita"
+msgstr "Pitjeu en el nom de l'espai de treball per editar-lo"
 
 #: ../mcs-plugin/workspaces.c:493
-#, fuzzy
 msgid "Number of workspaces:"
-msgstr "Nú~mero de:"
+msgstr "Nombre d'espais de treball:"
 
 #: ../mcs-plugin/workspaces.c:527
-#, fuzzy
 msgid "Workspace names"
-msgstr "Noms de les àrees de treball"
+msgstr "Noms dels espais de treball"
 
 #: ../mcs-plugin/xfwm4_plugin.c:68
-#, fuzzy
 msgid "Menu"
 msgstr "Menú"
 
@@ -282,467 +256,384 @@ msgid "Shade"
 msgstr "Enrotlla"
 
 #: ../mcs-plugin/xfwm4_plugin.c:71
-#, fuzzy
 msgid "Hide"
-msgstr "Oculta"
+msgstr "Amaga"
 
 #: ../mcs-plugin/xfwm4_plugin.c:72
-#, fuzzy
 msgid "Maximize"
-msgstr "Augmenta"
+msgstr "Maximitza"
 
 #: ../mcs-plugin/xfwm4_plugin.c:73
-#, fuzzy
 msgid "Close"
 msgstr "Tanca"
 
 #: ../mcs-plugin/xfwm4_plugin.c:78 ../mcs-plugin/xfwm4_shortcuteditor.c:356
-#, fuzzy
 msgid "Shade window"
 msgstr "Enrotlla la finestra"
 
 #: ../mcs-plugin/xfwm4_plugin.c:79 ../mcs-plugin/xfwm4_shortcuteditor.c:355
-#, fuzzy
 msgid "Hide window"
-msgstr "Oculta finestra"
+msgstr "Amaga la finestra"
 
 #: ../mcs-plugin/xfwm4_plugin.c:80 ../mcs-plugin/xfwm4_shortcuteditor.c:352
-#, fuzzy
 msgid "Maximize window"
 msgstr "Maximitza la finestra"
 
 #: ../mcs-plugin/xfwm4_plugin.c:81
-#, fuzzy
 msgid "Nothing"
 msgstr "Res"
 
 #: ../mcs-plugin/xfwm4_plugin.c:86
-#, fuzzy
 msgid "Left"
 msgstr "Esquerra"
 
 #: ../mcs-plugin/xfwm4_plugin.c:87
-#, fuzzy
 msgid "Center"
-msgstr "Centrada"
+msgstr "Centrat"
 
 #: ../mcs-plugin/xfwm4_plugin.c:88
-#, fuzzy
 msgid "Right"
 msgstr "Dreta"
 
 #: ../mcs-plugin/xfwm4_plugin.c:574
-#, fuzzy
 msgid "Click and drag buttons to change the layout"
-msgstr "Feu clic i a   "
+msgstr "Pitjeu i arrossegueu el botons per canviar el disseny"
 
 #: ../mcs-plugin/xfwm4_plugin.c:579
-#, fuzzy
 msgid "Active"
 msgstr "Actiu"
 
 #: ../mcs-plugin/xfwm4_plugin.c:590
-#, fuzzy
 msgid "Title"
 msgstr "Títol"
 
 #: ../mcs-plugin/xfwm4_plugin.c:591
-#, fuzzy
 msgid "The window title, it cannot be removed"
-msgstr "finestra"
+msgstr "El títol de la finestra no es pot treure"
 
 #: ../mcs-plugin/xfwm4_plugin.c:599
-#, fuzzy
 msgid "Hidden"
-msgstr "Amagat"
+msgstr "Ocult"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1373
-#, fuzzy
 msgid "Font Selection Dialog"
-msgstr "Diàleg de selecció del tipus de lletra"
+msgstr "Diàleg de selecció de fonts"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1438
-#, fuzzy
 msgid "Window Manager"
 msgstr "Gestor de finestres"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1478
-#, fuzzy
 msgid "Title font"
-msgstr "Títol"
+msgstr "Font del títol"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1487
-#, fuzzy
 msgid "Title Alignment"
-msgstr "Títol Alineació"
+msgstr "Alineació del títol"
 
 #. XXX
 #: ../mcs-plugin/xfwm4_plugin.c:1489
-#, fuzzy
 msgid "Text alignment inside title bar :"
-msgstr "Text dins:"
+msgstr "Alineació del text dins de la barra de títol:"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1495
-#, fuzzy
 msgid "Button layout"
-msgstr "Botó"
+msgstr "Disseny dels botons"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1500
-#, fuzzy
 msgid "Style"
 msgstr "Estil"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1548
-#, fuzzy
 msgid "Window shortcuts"
-msgstr "Finestra"
+msgstr "Dreceres de finestres"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1562
-#, fuzzy
 msgid "Command"
 msgstr "Ordre"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1568
-#, fuzzy
 msgid "Shortcut"
 msgstr "Drecera"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1585
-#, fuzzy
 msgid "Keyboard"
 msgstr "Teclat"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1600
-#, fuzzy
 msgid "Focus model"
-msgstr "Focus"
+msgstr "Tipus d'enfocament"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1604
-#, fuzzy
 msgid "Click to focus"
-msgstr "Feu clic a "
+msgstr "S'enfoca al pitjar"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1614
-#, fuzzy
 msgid "Focus follows mouse"
-msgstr "Focus ratolí"
+msgstr "L'enfocament segueix el ratolí"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1625
-#, fuzzy
 msgid "Automatically give focus to newly created windows"
-msgstr "Automàticament a  finestres"
+msgstr "Automàticament enfoca les finestres noves"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1629
-#, fuzzy
 msgid "New window focus"
-msgstr "Nou finestra"
+msgstr "Enfocament de les noves finestres"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1636
-#, fuzzy
 msgid "Raise on focus"
-msgstr "Eleva quan s'enfoqui"
+msgstr "Primer pla al enfocar"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1642
-#, fuzzy
 msgid "Automatically raise windows when they receive focus"
-msgstr "Automàticament finestres"
+msgstr ""
+"Automàticament coŀloca en primer pla les finestres quan rebin l'enfocament"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1652
-#, fuzzy
 msgid "Delay before raising focused window :"
-msgstr "Retard abans de finestra:"
+msgstr "Retard abans de coŀlocar en primer pla la finestra:"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1659
-#, fuzzy
 msgid "Slow"
 msgstr "Lent"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1666
-#, fuzzy
 msgid "Fast"
-msgstr "Ràpida"
+msgstr "Ràpid"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1687
-#, fuzzy
 msgid "Raise window when clicking inside application window"
-msgstr "Puja finestra dins aplicació finestra"
+msgstr ""
+"Coŀloca en primer pla la finestra quan es pitgi dins la finestra de "
+"l'aplicació"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1691
-#, fuzzy
 msgid "Raise on click"
-msgstr "Puja on feu clic"
+msgstr "Primer pla al pitjar"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1709
 #, fuzzy
 msgid "Windows snapping"
-msgstr "Finestres"
+msgstr "Alineació ràpida de finestres"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1714
 #, fuzzy
 msgid "Snap windows to screen border"
-msgstr "Captura finestres a  pantalla"
+msgstr "Alinea ràpidament les finestres a la vora de la pantalla"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1720
 #, fuzzy
 msgid "Snap windows to other windows"
-msgstr "Captura finestres a  altra finestres"
+msgstr "Alinea ràpidament les finestres amb les altres finestres"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1731
-#, fuzzy
 msgid "Distance :"
 msgstr "Distància:"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1738
-#, fuzzy
 msgid "Distance|Small"
-msgstr "Distància:"
+msgstr "Petita"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1745
-#, fuzzy
 msgid "Distance|Wide"
-msgstr "Distància:"
+msgstr "Gran"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1766
-#, fuzzy
 msgid "Wrap workspaces"
-msgstr "Ajusta"
+msgstr "Moviment entre els espais de treball"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1772
-#, fuzzy
 msgid "Wrap workspaces when the pointer reaches a screen edge"
-msgstr "Ajusta   a pantalla"
+msgstr ""
+"Canvia d'espai de treball quan el punter arribi a un dels laterals de la "
+"pantalla"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1780
-#, fuzzy
 msgid "Wrap workspaces when dragging a window off the screen"
-msgstr "Ajusta a finestra off   pantalla"
+msgstr ""
+"Canvia d'espai de treball quan s'arrossegui una finestra fora de la pantalla"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1790
-#, fuzzy
 msgid "Edge Resistance :"
-msgstr "Vora:"
+msgstr "Resistència de les vores:"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1797
-#, fuzzy
 msgid "Resistance|Small"
-msgstr "Distància:"
+msgstr "Petita"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1804
-#, fuzzy
 msgid "Resistance|Wide"
-msgstr "Distància:"
+msgstr "Gran"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1826
-#, fuzzy
 msgid "Opaque move and resize"
-msgstr "Opac i"
+msgstr "Opacitat al moure i redimensionar"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1831
-#, fuzzy
 msgid "Display content of windows when resizing"
-msgstr "Visualització de finestres"
+msgstr "Mostra el contingut de les finestres quan es redimensionen"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1837
-#, fuzzy
 msgid "Display content of windows when moving"
-msgstr "Visualització de finestres"
+msgstr "Mostra el contingut de les finestres quan es mouen"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1842
-#, fuzzy
 msgid "Double click action"
-msgstr "Doble feu clic"
+msgstr "Acció del doble clic"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1844
-#, fuzzy
 msgid "Action to perform when double clicking on title bar :"
-msgstr "Acció a  on:"
+msgstr "Acció a realitzar quan es fa doble clic a la barra de títol:"
 
 #: ../mcs-plugin/xfwm4_plugin.c:1849
-#, fuzzy
 msgid "Advanced"
 msgstr "Avançat"
 
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/xfwm4_plugin.c:1988
-#, fuzzy
 msgid "Button Label|Window Manager"
 msgstr "Gestor de finestres"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:53
-#, fuzzy
 msgid "Do you really want to remove this keybinding theme ?"
-msgstr "tu a  elimina aquest?"
+msgstr "Voleu suprimir l'esquema d'assignació de tecles?"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:134
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:139
-#, fuzzy
 msgid "Add keybinding theme"
-msgstr "Afegeix"
+msgstr "Afegeix un esquema d'assignació de tecles"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:143
-#, fuzzy
 msgid "Enter a name for the theme:"
-msgstr "Retorn a nom per a  :"
+msgstr "Introduïu nom per l'esquema:"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:178
-#, fuzzy
 msgid "A keybinding theme with the same name already exists"
-msgstr "A amb   nom existeix"
+msgstr "Ja hi ha un altre esquema d'assignació de tecles amb aquest nom"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:184
-#, fuzzy
 msgid "You have to provide a name for the keybinding theme"
-msgstr "Tu a  a nom per a  "
+msgstr "Introduïu un nom per l'esquema d'assignació de tecles"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:351
-#, fuzzy
 msgid "Close window"
 msgstr "Tanca la finestra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:353
-#, fuzzy
 msgid "Maximize window vertically"
 msgstr "Maximitza la finestra verticalment"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:354
-#, fuzzy
 msgid "Maximize window horizontally"
 msgstr "Maximitza la finestra horitzontalment"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:357
-#, fuzzy
 msgid "Stick window"
-msgstr "finestra"
+msgstr "Finestra omnipresent"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:358
-#, fuzzy
 msgid "Move window up"
-msgstr "Envia-la a la subàrea de dalt"
+msgstr "Mou la finestra amunt"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:359
-#, fuzzy
 msgid "Move window down"
-msgstr "Envia-la a la subàrea de baix"
+msgstr "Mou la finestra avall"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:360
-#, fuzzy
 msgid "Move window left"
-msgstr "Envia-la a la subàrea de l'esquerra"
+msgstr "Mou la finestra cap a l'esquerra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:361
-#, fuzzy
 msgid "Move window right"
-msgstr "Envia-la a la subàrea de la dreta"
+msgstr "Mou la finestra cap a la dreta"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:362
-#, fuzzy
 msgid "Resize window up"
-msgstr "Canvia la mida finestra amunt"
+msgstr "Redimensiona la finestra cap amunt"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:363
-#, fuzzy
 msgid "Resize window down"
-msgstr "Canvia la mida finestra avall"
+msgstr "Redimensiona la finestra cap avall"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:364
-#, fuzzy
 msgid "Resize window left"
-msgstr "Canvia la mida finestra esquerra"
+msgstr "Redimensiona la finestra cap a l'esquerra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:365
-#, fuzzy
 msgid "Resize window right"
-msgstr "Canvia la mida finestra dreta"
+msgstr "Redimensiona la finestra cap a la dreta"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:366
-#, fuzzy
 msgid "Raise window"
 msgstr "Eleva la finestra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:367
-#, fuzzy
 msgid "Lower window"
 msgstr "Abaixa la finestra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:368
-#, fuzzy
 msgid "Toggle fullscreen"
-msgstr "Commuta"
+msgstr "Commuta a pantalla completa"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:369
-#, fuzzy
 msgid "Upper workspace"
-msgstr "Superior l'àrea de treball"
+msgstr "Espai de treball superior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:370
-#, fuzzy
 msgid "Bottom workspace"
-msgstr "Inferior l'àrea de treball"
+msgstr "Espai de treball inferior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:371
-#, fuzzy
 msgid "Left workspace"
-msgstr "Esquerra l'àrea de treball"
+msgstr "Espai de treball esquerra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:372
-#, fuzzy
 msgid "Right workspace"
-msgstr "Dreta l'àrea de treball"
+msgstr "Espai de treball dret"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:373
-#, fuzzy
 msgid "Next workspace"
-msgstr "Selecciona l'àrea següent"
+msgstr "Espai de treball següent"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:374
-#, fuzzy
 msgid "Previous workspace"
-msgstr "Selecciona l'àrea precedent"
+msgstr "Espai de treball anterior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:375
-#, fuzzy
 msgid "Add workspace"
-msgstr "Afegeix l'àrea de treball"
+msgstr "Afegeix espai de treball"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:376
-#, fuzzy
 msgid "Delete workspace"
-msgstr "Suprimeix l'àrea de treball"
+msgstr "Esborra l'espai de treball"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:377
-#, fuzzy
 msgid "Move window to next workspace"
-msgstr "Mou finestra a  l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball següent"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:378
-#, fuzzy
 msgid "Move window to previous workspace"
-msgstr "Mou finestra a  l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball anterior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:379
-#, fuzzy
 msgid "Move window to upper workspace"
-msgstr "Mou finestra a  l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball superior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:380
-#, fuzzy
 msgid "Move window to bottom workspace"
-msgstr "Mou finestra a  inferior l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball esquerra inferior"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:381
-#, fuzzy
 msgid "Move window to left workspace"
-msgstr "Mou finestra a  esquerra l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball esquerra"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:382
-#, fuzzy
 msgid "Move window to right workspace"
-msgstr "Mou finestra a  dreta l'àrea de treball"
+msgstr "Mou la finestra a l'espai de treball dret"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:383
-#, fuzzy
 msgid "Show desktop"
-msgstr "Mostra"
+msgstr "Mostrar l'escriptori"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:491
 #, c-format
@@ -750,9 +641,8 @@ msgid "Move window to workspace %d"
 msgstr "Mou la finestra a l'àrea de treball %d"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:578
-#, fuzzy
 msgid "Cannot open the theme directory !"
-msgstr "obre  !"
+msgstr "No s'ha pogut obrir el directori de l'esquema"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:597
 #, c-format
@@ -778,27 +668,26 @@ msgid ""
 "Shortcut already in use !\n"
 "Are you sure you want to use it ?"
 msgstr ""
+"La drecera ja s'està emprant.\n"
+"Esteu segur de voler emprar-la?"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:847
-#, fuzzy
 msgid "Compose shortcut for :"
-msgstr "Nou missatge drecera per a:"
+msgstr "Creo una drecera per:"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:851
-#, fuzzy
 msgid "Compose shortcut"
-msgstr "Nou missatge drecera"
+msgstr "Crea una drecera"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:854
-#, fuzzy
 msgid "No shortcut"
-msgstr "No drecera"
+msgstr "Sense drecera"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/hints.c:77
 #, c-format
 msgid "%s (on %s)"
-msgstr ""
+msgstr "%s (a %s)"
 
 #: ../src/main.c:188
 #, c-format
@@ -806,84 +695,68 @@ msgid "%s: Segmentation fault"
 msgstr "%s: Segmentation fault (violació de segment)"
 
 #: ../src/menu.c:40
-#, fuzzy
 msgid "Ma_ximize"
 msgstr "Ma_ximitza"
 
 #: ../src/menu.c:41
-#, fuzzy
 msgid "Un_maximize"
-msgstr "Des_maximitza"
+msgstr "Desma_ximitza"
 
 #: ../src/menu.c:42
-#, fuzzy
 msgid "_Hide"
 msgstr "_Amaga"
 
 #: ../src/menu.c:43
-#, fuzzy
 msgid "Hide _all others"
-msgstr "Oculta all"
+msgstr "Amaga _les altres"
 
 #: ../src/menu.c:44
-#, fuzzy
 msgid "S_how"
-msgstr "S"
+msgstr "_Mostra"
 
 #: ../src/menu.c:45
-#, fuzzy
 msgid "_Shade"
-msgstr "Ombra"
+msgstr "_Enrotlla"
 
 #: ../src/menu.c:46
-#, fuzzy
 msgid "Un_shade"
-msgstr "Des_ocultar"
+msgstr "Des_enrotlla"
 
 #: ../src/menu.c:47
-#, fuzzy
 msgid "S_tick"
-msgstr "S"
+msgstr "_Omnipresent"
 
 #: ../src/menu.c:48
-#, fuzzy
 msgid "Uns_tick"
-msgstr "Des_plega"
+msgstr "No _omnipresent"
 
 #: ../src/menu.c:49
-#, fuzzy
 msgid "Context _help"
-msgstr "Context ajuda"
+msgstr "A_juda contextual"
 
 #: ../src/menu.c:50 ../src/menu.c:51
-#, fuzzy
 msgid "Always on top"
-msgstr "Sempre en primer pla"
+msgstr "Sempre al damunt"
 
 #: ../src/menu.c:52
-#, fuzzy
 msgid "Send to..."
-msgstr "Envia a ."
+msgstr "Envia a…"
 
 #: ../src/menu.c:54
-#, fuzzy
 msgid "_Close"
-msgstr "Tan_ca"
+msgstr "_Tanca"
 
 #: ../src/menu.c:57
-#, fuzzy
 msgid "Destroy"
 msgstr "Destrueix"
 
 #: ../src/menu.c:60
-#, fuzzy
 msgid "_Quit"
 msgstr "_Surt"
 
 #: ../src/menu.c:61
-#, fuzzy
 msgid "Restart"
-msgstr "Torna a iniciar"
+msgstr "Reinicia"
 
 #: ../src/menu.c:169
 #, c-format
@@ -911,36 +784,31 @@ msgid "%s: Cannot parse color %s\n"
 msgstr "%s: no s'ha pogut analitzar el color %s\n"
 
 #: ../src/tabwin.c:94
-#, fuzzy
 msgid "Unknown application!"
-msgstr "Desconegut aplicació!"
+msgstr "Aplicació desconeguda!"
 
 #: ../mcs-plugin/xfce-wm-settings.desktop.in.h:1
-#, fuzzy
 msgid "Window Manager Settings"
-msgstr "Finestra Gestor"
+msgstr "Paràmetres del gestor de finestres"
 
 #: ../mcs-plugin/xfce-wm-settings.desktop.in.h:2
-#, fuzzy
 msgid "Xfce 4 Window Manager Settings"
-msgstr "Finestra Gestor"
+msgstr "Paràmetres del gestor de finestres d'Xfce 4"
 
 #: ../mcs-plugin/xfce-wmtweaks-settings.desktop.in.h:1
-#, fuzzy
 msgid "Advanced Configuration"
-msgstr "Finestra Gestor Avançat Configuració"
+msgstr "Configuració avançada"
 
 #: ../mcs-plugin/xfce-wmtweaks-settings.desktop.in.h:3
 #, fuzzy
 msgid "Xfce 4 Window Manager Tweaks"
-msgstr "Finestra Gestor"
+msgstr "Ajustaments avançats del gestor de finestres d'Xfce 4"
 
 #: ../mcs-plugin/xfce-workspaces-settings.desktop.in.h:1
-#, fuzzy
 msgid "Workspaces Settings"
-msgstr "Marges dels espais de treball"
+msgstr "Paràmetres dels espais de treball"
 
 #: ../mcs-plugin/xfce-workspaces-settings.desktop.in.h:2
-#, fuzzy
 msgid "Xfce 4 Workspaces Settings"
-msgstr "Marges dels espais de treball"
+msgstr ""
+"Paràmetres dels espais de treball d'Xfce 4Marges dels espais de treball"