diff --git a/mcs-plugin/xfce-wm-settings.desktop b/mcs-plugin/xfce-wm-settings.desktop
index 12104e60dcef8879c70ce9112da3884bdb3ba6f3..76c573a3fc467e85a26ad2b4ecb0e94eced99317 100644
--- a/mcs-plugin/xfce-wm-settings.desktop
+++ b/mcs-plugin/xfce-wm-settings.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Xfce 4 Window Manager Settings
+Name[fr]=Paramètres du gestionnaire de fenêtres de Xfce 4
 Comment=Window Manager Settings
+Comment[fr]=Paramétrage du gestionnaire de fenêtres
 Exec=xfce-setting-show xfwm4
 Icon=xfwm4
 Terminal=false
diff --git a/mcs-plugin/xfce-workspaces-settings.desktop b/mcs-plugin/xfce-workspaces-settings.desktop
index 98b0c74bf8724a153f31e0fc0b2c0ec85f026514..5574efa1db100cd828074498ef4f5abdfd97f1bb 100644
--- a/mcs-plugin/xfce-workspaces-settings.desktop
+++ b/mcs-plugin/xfce-workspaces-settings.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Xfce 4 Workspaces Settings
+Name[fr]=Paramètres des espaces virtuels de Xfce 4
 Comment=Workspaces Settings
+Comment[fr]=Paramétrage des espaces virtuels
 Exec=xfce-setting-show workspaces
 Icon=xfce4-workspaces
 Terminal=false
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index 1e846465078b23b637e0b30290824545ef55d449..c48475e4f6f1efdf92e01ebea3eee9575c0a7367 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -567,6 +567,7 @@ create_layout_buttons (gchar * layout, gpointer user_data)
     vbox = gtk_vbox_new (TRUE, 0);
  
     label = gtk_label_new (_("Click and drag buttons to change the layout"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
     gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
     gtk_widget_show (label);
 
@@ -608,7 +609,7 @@ create_layout_buttons (gchar * layout, gpointer user_data)
         image = gtk_image_new_from_stock (title_button[i].stock_icon, GTK_ICON_SIZE_MENU);
         button = gtk_button_new ();
       	gtk_container_add (GTK_CONTAINER (button), image);
-	gtk_tooltips_set_tip (tooltips, button, title_button[i].desc, title_button[i].desc);
+	gtk_tooltips_set_tip (tooltips, button, _(title_button[i].desc), _(title_button[i].desc));
         gtk_drag_source_set (button, GDK_BUTTON1_MASK, &entry, 1, GDK_ACTION_MOVE);
         g_signal_connect (button, "drag-data-get", G_CALLBACK (data_get), NULL);
         g_signal_connect (button, "drag_begin", G_CALLBACK (button_drag_begin), NULL);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 52a5d385985568d6a2d390d22019ee764031e284..12707283234d6fc279412fa7b200cb4913e5ce0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,19 @@
 mcs-plugin/margins.c
 mcs-plugin/margins.h
+mcs-plugin/monitor-icon.h
 mcs-plugin/plugin.c
 mcs-plugin/plugin.h
 mcs-plugin/workspaces.c
 mcs-plugin/workspaces.h
 mcs-plugin/xfwm4_plugin.c
+mcs-plugin/xfwm4_plugin.h
+mcs-plugin/xfwm4_plugin_orig.c
+mcs-plugin/xfwm4_shortcuteditor.c
+mcs-plugin/xfwm4_shortcuteditor.h
 src/client.c
 src/client.h
 src/display.c
-src/display.c
+src/display.h
 src/events.c
 src/events.h
 src/focus.c
@@ -19,6 +24,8 @@ src/hints.c
 src/hints.h
 src/icons.c
 src/icons.h
+src/inline-default-icon.h
+src/inline-tabwin-icon.h
 src/keyboard.c
 src/keyboard.h
 src/main.c
@@ -39,7 +46,7 @@ src/placement.h
 src/poswin.c
 src/poswin.h
 src/screen.c
-src/screen.c
+src/screen.h
 src/session.c
 src/session.h
 src/settings.c
diff --git a/po/ar.gmo b/po/ar.gmo
index 0804254009d4b36f5c964638c5186477fcc51e03..52ae0c0df311b699e8076dd9daaab40ec96d65b7 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 669eb82d650c8306cb1e1a72d26484076a6b723e..8adf615f0673d061fb680b83b56d1c0d2d6834ba 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-3-8 8:25+0300\n"
 "Last-Translator: saleh alhathal <hathalsal@hotmail.com>\n"
 "Language-Team: arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -84,55 +84,58 @@ msgstr "صفف بيئات العمل"
 msgid "Workspace names"
 msgstr "_بيئة العمل"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "قائمة"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "الصق"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "تظليل"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "اخفاء"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "تكبير"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "أغلق"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "تظليل نافذة"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "اخفاء نافذة"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "تكبير نافذة"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "ﻻ شيء"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "يسار"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "وسط"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "يمين"
 
@@ -140,217 +143,511 @@ msgstr "يمين"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "عنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "مخفى"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "اختيار الخط"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "مدير النوافذ"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "تفضيلات مدير النوافذ"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "خط العنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "تسوية العنوان"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "تسوية الخط داخل شريط العنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "زر الهيئة"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "عنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "مظهر النافذة"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "اختصارات لوحة المفاتيح"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "اختصارات لوحة المفاتيح"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 #, fuzzy
 msgid "Focus model"
 msgstr "طراز التركيز"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "انقر لنقل التركيز"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 #, fuzzy
 msgid "Focus follows mouse"
 msgstr "التركيز يتبع الفأرة"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "التركيز للنافذة الجديدة"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "اعطاء التركيز اوتوماتيكيا \n"
 " للنوافذ الجديدة"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "ارفع عندما تتلقى التركيز"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "رفع النوافذ اوتوماتيكيا \n"
 "عندما تتلقى التركيز"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "التأخير قبل رفع النافذة ذات التركيز"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "بطئ"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "سريع"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "ارفع عند النقر"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "ارفع النافذة عند النقر داخل \n"
 "نافذة البرنامج"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "طراز التركيز"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "مدير النوافذ"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "جذب النوافذ  الى حدود الشاشة"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "جذب النوافذ  الى حدود الشاشة"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "المسافة :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "صغير"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "عرض"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "صفف بيئات العمل"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "صفف بيئات العمل عند سحب نافذة خارج حدود الشاشة"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "صفف بيئات العمل عند سحب نافذة خارج حدود الشاشة"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "المسافة :"
 
 #
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 #, fuzzy
 msgid "Opaque move and resize"
 msgstr "اعادة تحجيم معتم"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "عرض محتوى النوافذ عند اعادة التحجيم"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 #, fuzzy
 msgid "Display content of windows when moving"
 msgstr "عرض محتوى النوافذ عند التنقل"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "المهمة عند النقر مرتين "
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "تنفيذ المهمة التالية عند النقر مرتين على عمود العنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "متقدم"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"اعطاء التركيز اوتوماتيكيا \n"
+" للنوافذ الجديدة"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"رفع النوافذ اوتوماتيكيا \n"
+"عندما تتلقى التركيز"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"ارفع النافذة عند النقر داخل \n"
+"نافذة البرنامج"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "تكبير نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "تكبير نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "اخفاء نافذة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "صفف بيئات العمل"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "صفف بيئات العمل"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "صفف بيئات العمل"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "صفف بيئات العمل"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "بيئة العمل %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "صفف بيئات العمل"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "التركيز للنافذة الجديدة"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "اختصارات لوحة المفاتيح"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "اختصارات لوحة المفاتيح"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "اختصارات لوحة المفاتيح"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: العملية ليست مدعومة (بعد)\n"
@@ -513,114 +810,6 @@ msgstr "تغيير الى ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "تكبير نافذة"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "تكبير نافذة"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "التركيز للنافذة الجديدة"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "التركيز للنافذة الجديدة"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "التركيز للنافذة الجديدة"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "اخفاء نافذة"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "صفف بيئات العمل"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "صفف بيئات العمل"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "صفف بيئات العمل"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "صفف بيئات العمل"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "بيئة العمل %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "بيئة العمل %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "السمة"
 
diff --git a/po/az.gmo b/po/az.gmo
index 14f9b909902f590b08872e85b0bad990bc9d1478..834b415d3353ee1c2600584fa41fd9a2cf5a988c 100644
Binary files a/po/az.gmo and b/po/az.gmo differ
diff --git a/po/az.po b/po/az.po
index a6aada032695cacf33a089e17273cca2c1f79800..4e745ed1526847f48e82ffe2c3d10952bd0cb88c 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm 4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-12-13 01:12+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -85,55 +85,58 @@ msgstr "İş sahələrini dəyişdir"
 msgid "Workspace names"
 msgstr "İş Sahəsi Kənarları"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menyu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "SabitlÉ™"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Bur"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Gizlət"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Böyüt"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "BaÄŸla"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Pəncərəni bur"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Pəncərəni gizlət"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Pəncərəni böyüt"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Heçnə"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Sol"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Orta"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "SaÄŸ"
 
@@ -141,207 +144,501 @@ msgstr "SaÄŸ"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Başlıq"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Gizli"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Yazı Növü Seçimi Dialoqu"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Pəncərə İdarəçisi"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Pəncərə İdarəçisi Xassələri"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Başlıq yazı növü"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Başlıq Hizası"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Başlıq çubuğu içində mətnin hizası :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Düymə düzülüşü"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Başlıq"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Yeni pəncərə fokusu"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Klaviatura Qısa Yolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Klaviatura Qısa Yolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Klaviatura Qısa Yolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Fokus növü"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Fokus üçün tıqlansın"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Fokus siçanı izləsin"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Yeni pəncərə fokusu"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Yeni yaradılmış pəncərələri \n"
 "avtomatik olaraq fokusa al"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Fokusda qabağa gətir"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Pəncərələrə fokus veriləndə \n"
 "onları avtomatik olaraq qabağa gətir"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Fokuslu pəncərənin qabağa gətirilmə gecikməsi:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "YavaÅŸ"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Sür'ətli"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Tıqlamada qabağa gətir"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Proqram pəncərəsinin içinə tıqlandığında\n"
 "pəncərəni qabağa gətir"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Fokus növü"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Pəncərə yapışması"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Pəncərələri ekran kənarlarına yapışdır"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Pəncərələri digərlərinə yapışdır"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Məsafə :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Kiçik"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "GeniÅŸ"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "İş sahələrini dəyişdir"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Siçan ekran kənarına gəldiyində iş sahələrini dəyişdir"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Pəncərə·ekran·kənarına·daşındığında iş·sahələrini·dəyişdir"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Kənar Müqaviməti :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Şəffaf daşınma və ölçüləndirmə"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Daşındığında pəncərələrin məzmununu göstər"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Cüt tıqlama gedişatı"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Başlıq çubuğuna cüt tıqlandığında həyata keçiriləcək gedişat :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Təfərruatlar"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Yeni yaradılmış pəncərələri \n"
+"avtomatik olaraq fokusa al"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Pəncərələrə fokus veriləndə \n"
+"onları avtomatik olaraq qabağa gətir"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Proqram pəncərəsinin içinə tıqlandığında\n"
+"pəncərəni qabağa gətir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Pəncərəni böyüt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Pəncərəni böyüt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Pəncərəni gizlət"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "İş sahələrini dəyişdir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "İş sahələrini dəyişdir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "İş sahələrini dəyişdir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "İş sahələrini dəyişdir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "İş Sahəsi %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "İş sahələrini dəyişdir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Yeni pəncərə fokusu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Klaviatura Qısa Yolu"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Klaviatura Qısa Yolu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Klaviatura Qısa Yolu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Gedişat dəstəklənmir (hələlik)\n"
@@ -503,114 +800,6 @@ msgstr "Keç ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Pəncərəni böyüt"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Pəncərəni böyüt"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Yeni pəncərə fokusu"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Yeni pəncərə fokusu"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Yeni pəncərə fokusu"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Pəncərəni gizlət"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "İş sahələrini dəyişdir"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "İş sahələrini dəyişdir"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "İş sahələrini dəyişdir"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "İş sahələrini dəyişdir"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "İş Sahəsi %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "İş Sahəsi %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Bəzək tərzi"
 
diff --git a/po/bg.gmo b/po/bg.gmo
index 2ca05aafa4311e00a1f1cf28654229f748d13d01..d4440c0e49c3703f0897126f568b2f607267fe28 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 0dcc8ebfe0510afb20c007949cec9aa6acb43ba3..5a2a99526a03aaf3d53d5ec6e6b11593ccf6af5e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-03-09 19:04+0200\n"
 "Last-Translator: Miroslav Yordanov <miordanov@i-space.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -87,55 +87,58 @@ msgstr "Превключване на работните места"
 msgid "Workspace names"
 msgstr "Граница на работно място"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Меню"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Забодено"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Сянка"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Скрива"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Максимизира"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Затваряне"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Засенчва прозореца"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Скрива прозореца"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Максимизира прозореца"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Нищо"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Ляво"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Център"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Дясно"
 
@@ -143,207 +146,501 @@ msgstr "Дясно"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Заглавие"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Скрит"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Диалог за избиране на шрифт"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Мениджър на прозорци"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Настройки на мениджъра·на·прозорци"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Шрифт на заглавието"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Подравнение на заглавието"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Подравнява текста в заглавната лента :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Разположение на бутоните"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Заглавие"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Новите прозорци се фокусират"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Клавишни комбинации"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Клавишни комбинации"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Клавишни комбинации"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Тип на фокуса"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Натискане за фокус"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Фокуса следва мишката"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Новите прозорци се фокусират"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Автоматично се фокусират\n"
 "новосъздадените прозорци"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Повдига при фокусиране"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Автоматично повдига прозорците·\n"
 "когато се фокусират"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Изчакване преди да се повдигне фокусирания прозорец :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Бавно"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Бързо"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Повдигане при натискане"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Повдига прозореца когато се натисне\n"
 "в прозореца на приложението"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Тип на фокуса"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Прилепване на прозорците"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Прилепва прозорците по границата на екрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Прилеплва прозорците до другите прозорци"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Разстояние :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Малко"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Голямо"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Превключване на работните места"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Превключва работните места когато курсора достигне края на екрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Превклюва работните места когато се изтегля прозорец извън екрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Съпротивление по краищата :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Непрозрачно местене и промяна на размера"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Показва съдържанието на прозорците при промяна на размера"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Показва·съдържанието·на·прозорците·при местене"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Действие при двойно натискане"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Действие което да се извърши при двойно натискане на заглавната лента"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Допълнителни"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Автоматично се фокусират\n"
+"новосъздадените прозорци"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Автоматично повдига прозорците·\n"
+"когато се фокусират"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Повдига прозореца когато се натисне\n"
+"в прозореца на приложението"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Максимизира прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Максимизира прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Скрива прозореца"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Превключване на работните места"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Превключване на работните места"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Превключване на работните места"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Превключване на работните места"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Работно място %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Превключване на работните места"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Новите прозорци се фокусират"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Клавишни комбинации"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Клавишни комбинации"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Клавишни комбинации"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
@@ -505,114 +802,6 @@ msgstr "Превключва на ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Максимизира прозореца"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Максимизира прозореца"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Новите прозорци се фокусират"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Новите прозорци се фокусират"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Новите прозорци се фокусират"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Скрива прозореца"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Превключване на работните места"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Превключване на работните места"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Превключване на работните места"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Превключване на работните места"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Работно място %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Работно място %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Стил на декорацията"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 06a5ceea7d9b99d5cbb256e2d0a2cfe5b29eae70..89f29f24df7cba999c00f313a8121d294a8ffeaf 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 4df6ba65b41b13265d13b504dca7dbf8227573c9..673580fb20ec7f1af3026efaf57271350e6f9ab3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-03-29 22:19+0100\n"
 "Last-Translator: Carles Munoz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: ca <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -81,55 +81,58 @@ msgstr "Nombre d'espais de treball"
 msgid "Workspace names"
 msgstr "Noms dels espais de treball"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menú"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Omnipresent"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Enrotlla"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Oculta"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Tanca"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Enrotlla la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Oculta la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximitza la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Res"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Esquerre"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centre"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Dret"
 
@@ -137,210 +140,504 @@ msgstr "Dret"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Títol"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Ocult"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Diàleg de selecció del tipus de lletra"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gestor de Finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Ajustaments del Gestor de Finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Tipus de lletra del títol"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alineació del títol"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alineació dintre de la barra de títol:"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Disseny del botó"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Títol"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Enfocar les noves finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Dreceres de Teclat"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Dreceres de Teclat"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Dreceres de Teclat"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Tipus d'enfocament"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Pitjeu per enfocar"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "L'enfocament segueix el ratolí"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Enfocar les noves finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automàticament enfoca les \n"
 "finestres de nova creació"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Col·locar en primer pla al enfocar"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automàticament col·loca en \n"
 "primer pla les finestres enfocades"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Retard abans de col·locar en primer pla la finestra:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lent"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Ràpid"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Col·loca en primer pla al pitjar"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Col·loca en primer pla la finestra quan es\n"
 "pitgi dins la finestra de l'aplicació"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Tipus d'enfocament"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Alineació de les finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Alinea les finestres a la vora de la pantalla"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Alinea les finestres amb les altres finestres"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distància:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Menuda"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Gran"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Ajustar els espais de treball"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 "Salta de espai de treball quan el punter assoleixi un dels laterals de la "
 "pantalla"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 "Salta de espai de treball quan s'arrossegui una finestra fora de la pantalla"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistència del lateral:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Moure i canviar de mida opac"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Mostra el contingut de les finestres quan canvien de mida"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostra el contingut de les finestres quan es mouen"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Acció del doble clic"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Acció a realitzar que es fa doble clic a la barra de títol:"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automàticament enfoca les \n"
+"finestres de nova creació"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automàticament col·loca en \n"
+"primer pla les finestres enfocades"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Col·loca en primer pla la finestra quan es\n"
+"pitgi dins la finestra de l'aplicació"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximitza la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximitza la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Oculta la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Ajustar els espais de treball"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Ajustar els espais de treball"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Ajustar els espais de treball"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Ajustar els espais de treball"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Espai de treball %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Ajustar els espais de treball"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Enfocar les noves finestres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Dreceres de Teclat"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Dreceres de Teclat"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Dreceres de Teclat"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operació encara no suportada\n"
@@ -504,114 +801,6 @@ msgstr "Canvia a..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximitza la finestra"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximitza la finestra"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Enfocar les noves finestres"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Enfocar les noves finestres"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Enfocar les noves finestres"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Oculta la finestra"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Ajustar els espais de treball"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Ajustar els espais de treball"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Ajustar els espais de treball"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Ajustar els espais de treball"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Espai de treball %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Espai de treball %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Estil de decoració"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 9eae28a961a6f5f9e8261a48b98628782d61cbe1..8d4a3976ba66f6cb78b95363ceebb19a90de965b 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 0ddf4e0c5954cc316aef470ecf531eb4a8422c33..84b83b77d8b082c6a9bc7d2d9d805b0a99816420 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lukas Konarovsky <daeltar@daeltar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -85,55 +85,58 @@ msgstr "Přepínání mezi plochami"
 msgid "Workspace names"
 msgstr "Okraje ploch"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Přilepit"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Zarolovat"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Minimalizovat"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Zavřít"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Zarolovat okno"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Skrýt okno"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximalizovat okno"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nic"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Vlevo"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Vystředit"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Vpravo"
 
@@ -141,208 +144,502 @@ msgstr "Vpravo"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titulek"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Skrýt"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Dialog pro Výběr Písma"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Správce Oken"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Nastavení Správce oken"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Písmo titulku"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Zarovnání Titulku"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Zarovnání titulku"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Rozmístění tlačítek"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Titulek"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Zaměření pro nová okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Klávesové zkratky"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Klávesové zkratky"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Klávesové zkratky"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Způsob zaměření"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Kliknout pro zaměření"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Zaměření následuje myš"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Zaměření pro nová okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automaticky nastavit zaměření \n"
 "pro nově vytvořená okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Zvednout při zaměření"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automaticky vyzdvihnount okna, \n"
 "pokud získají zaměření"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Zpoždění při vyzdvihnutí okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Pomalé"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rychlé"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "vyzdvihnout při kliknutí"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "vyzdvihnout při kliknutí \n"
 "do plochy okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Způsob zaměření"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Přichytávání oken"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Přichytávat okna k okrajům obrazovky"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Přichytávat okna k jiným oknům"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Přilnavost :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Nízká"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Vysoká"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Přepínání mezi plochami"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Přepnout plochu při ukázání kurzorem myši k okraji plochy"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Přepnout plochu při přetáhnutí okna mimo oblast obrazovky"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 #, fuzzy
 msgid "Edge Resistance :"
 msgstr "Přilnavost :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Zobrazování obsahu okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Zobrazování obsahu okna při změně velikosti"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Zobrazování obsahu okna při tažení a přesunu"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Akce při dvojkliku"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Akce při dvojkliku na titulkový pruh :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automaticky nastavit zaměření \n"
+"pro nově vytvořená okna"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automaticky vyzdvihnount okna, \n"
+"pokud získají zaměření"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"vyzdvihnout při kliknutí \n"
+"do plochy okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximalizovat okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximalizovat okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Skrýt okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Přepínání mezi plochami"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Přepínání mezi plochami"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Přepínání mezi plochami"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Přepínání mezi plochami"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Plocha %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Přepínání mezi plochami"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Zaměření pro nová okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Klávesové zkratky"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Klávesové zkratky"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Klávesové zkratky"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "s: Operace není podporována (prozatím)\n"
@@ -504,114 +801,6 @@ msgstr "Přepnout na ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximalizovat okno"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximalizovat okno"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Zaměření pro nová okna"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Zaměření pro nová okna"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Zaměření pro nová okna"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Skrýt okno"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Přepínání mezi plochami"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Přepínání mezi plochami"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Přepínání mezi plochami"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Přepínání mezi plochami"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Plocha %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Plocha %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Styl dekorace"
 
diff --git a/po/de.gmo b/po/de.gmo
index 110fbbba928561805d26c854e1022302ebdacad1..fbefc29d83bc683a4021e0a47b8090070d260823 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index ed95619497dd6a1313368412676a97b46133db18..f6e033a064fa6c72b9f6e097f9c8ec46f7e0b238 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-01-08 00:09+0100\n"
 "Last-Translator: Moritz Heiber <moe@lunar-linux.org>\n"
 "Language-Team: none <none@none>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -80,55 +80,58 @@ msgstr "Virtuellen Desktop wechseln..."
 msgid "Workspace names"
 msgstr "Desktopränder"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menü"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Kleben"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Einrollen"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Verstecken"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Schließen"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Fenster einrollen"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Fenster verstecken"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Fenster maximieren"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Keine Änderung"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Links"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Mitte"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Rechts"
 
@@ -136,201 +139,489 @@ msgstr "Rechts"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titelleiste"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Nicht anzeigen"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Schrift wählen"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Fenstermanager"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Fenstermanager Einstellungen"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Titelleistenschrift"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Titelleistenausrichtung"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Textausrichtung in der Titelleiste:"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Lage der Buttons"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Titelleiste"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Fokus bei neuen Fenstern"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Tastaturkürzel"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Tastaturkürzel"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Tastaturkürzel"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Fokuseinstellungen"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Fokus durch Mausklick"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Fokus folgt Mauszeiger"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Fokus bei neuen Fenstern"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr "Neue Fenster bekommen Fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Hervorheben bei Fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr "Bringe Fenster in den Vordergrund wenn sie den Fokus erhalten"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Verzögerung bevor ein Fenster in den Vordergrund gebracht wird:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Langsam"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Schnell"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Hervorheben durch klicken"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr "Hervorheben bei Klick in das Programmfenster"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Fokuseinstellungen"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Einschnappen von Fenstern"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Fenster am Desktoprand einschnappen lassen"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Fenster an anderen Fensterrändern einschnappen lassen"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distanz:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Klein"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Groß"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Virtuellen Desktop wechseln..."
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "...wenn der Mauszeiger den Bildschirmrand erreicht"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "...wenn ein Fenster aus dem Sichtfeld gezogen wird"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Distanz zum Rand:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Sichtbarer Fensterinhalt"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Inhalt bei Größenänderung anzeigen"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Inhalt beim Verschieben anzeigen"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Aktion bei Doppelklick"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Aktion, welche beim Doppeklicken auf die Titelleiste ausgeführt wird:"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Weitere Optionen"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr "Neue Fenster bekommen Fokus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr "Bringe Fenster in den Vordergrund wenn sie den Fokus erhalten"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr "Hervorheben bei Klick in das Programmfenster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Fenster maximieren"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Fenster maximieren"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Fenster verstecken"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Virtuellen Desktop wechseln..."
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Virtuellen Desktop wechseln..."
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Virtuellen Desktop wechseln..."
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Virtuellen Desktop wechseln..."
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Virtueller Desktop %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Virtuellen Desktop wechseln..."
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Fokus bei neuen Fenstern"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Tastaturkürzel"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Tastaturkürzel"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Tastaturkürzel"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operation (noch) nicht unterstuetzt\n"
@@ -492,114 +783,6 @@ msgstr "Wechseln zu ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Fenster maximieren"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Fenster maximieren"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Fokus bei neuen Fenstern"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Fokus bei neuen Fenstern"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Fokus bei neuen Fenstern"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Fenster verstecken"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Virtuellen Desktop wechseln..."
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Virtuellen Desktop wechseln..."
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Virtuellen Desktop wechseln..."
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Virtuellen Desktop wechseln..."
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Virtueller Desktop %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Virtueller Desktop %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Fensterdekoration"
 
diff --git a/po/es.gmo b/po/es.gmo
index 240d00f4262642d2344ab65afd52c636e168539e..137a4725f99dd5ea2cb8595b1df460ebe8dfbc04 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index a439b6cf1fdaff13ec98b3e80afc842dc14663f5..fb62395897d07decf73a8dd54faebc84bdb287b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-01-13 00:00+0100\n"
 "Last-Translator: Jaime Buffery <nestu@lunar-linux.org>\n"
 "Language-Team: none <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 #, fuzzy
@@ -89,55 +89,58 @@ msgstr "Número de escritorios"
 msgid "Workspace names"
 msgstr "Nombres de escritorio"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menú"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Pegar"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Enrollar"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Cerrar"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Enrollar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Ocultar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximizar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nada"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Izquierda"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centro"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Derecha"
 
@@ -145,214 +148,508 @@ msgstr "Derecha"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Oculto"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Diálogo de Selección de Fuente"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gestor de Ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Preferencias del Gestor de Ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Fuente del Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alineado del Título"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alineado del texto dentro de la barra de título :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Disposición de los botones"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Estilo de Ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Teclas Rápidas"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Teclas Rápidas"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Teclas Rápidas"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Pinchar para dar foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "El foco sigue al ratón"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Nuevo foco de ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automáticamente dar el foco a\n"
 "a las ventanas nuevas"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Levantar con el foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automáticamente levantar ventanas\n"
 "cuando tengan el foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Espera antes de levantar la ventana con foco :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lento"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rápido"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Levantar al pinchar"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Levantar la ventana cuando se pinche\n"
 "dentro de ella"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Atracción de las ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Pegar ventanas al borde del escritorio"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Atraer ventanas entre si"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distancia :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Pequeño"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Ancho"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Saltar al escritorio siguiente"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 "Saltar al siguiente escritorio cuando el puntero llegue al borde del "
 "escritorio"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 #, fuzzy
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 "Saltar al siguiente escritorio al arrastrar las ventanas fuera del "
 "escritorio actual"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistencia en los bordes :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Redimensionado y movimiento opaco"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr ""
 "Mostrar el contenido de las ventanas\n"
 "cuando se redimensionen"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostrar contenido de la ventana cuando se mueva"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Acción al hacer doble click"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Acción a realizar cuando se haga doble click en la barra de título :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automáticamente dar el foco a\n"
+"a las ventanas nuevas"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automáticamente levantar ventanas\n"
+"cuando tengan el foco"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Levantar la ventana cuando se pinche\n"
+"dentro de ella"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximizar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximizar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Teclas Rápidas"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Teclas Rápidas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Teclas Rápidas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operación no soportada (aún)\n"
@@ -516,114 +813,6 @@ msgstr "Cambiar a ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar ventana"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar ventana"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Escritorio %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Estilo de Decorado"
 
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index 0c829d066f147f0902cbb7c642d8e2a350583635..eb933372b67c7ab0b427ce684b32a5619b754eec 100644
Binary files a/po/es_MX.gmo and b/po/es_MX.gmo differ
diff --git a/po/es_MX.po b/po/es_MX.po
index 223361e32ae10e299d2aa7d0bfcbe6b0bfe0d6dc..7e9d3eb3aee2336ed35fabe9c12f3d1c1dbbc7cf 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-01-23 22:06+0100\n"
 "Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n"
 "Language-Team: none <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -86,55 +86,58 @@ msgstr "Saltar al escritorio siguiente"
 msgid "Workspace names"
 msgstr "Márgenes del espacio de trabajo"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menú"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Pegar"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Enrollar"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Cerrar"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Enrollar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Ocultar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximizar ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nada"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Izquierda"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centro"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Derecha"
 
@@ -142,207 +145,501 @@ msgstr "Derecha"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Oculto"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Diálogo de Selección de Fuente"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Administrador de Ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Preferencias del Administrador de Ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Fuente del Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alineado del Título"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alineado del texto en la barra de título :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Colocación de los Botones"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Estilo de Ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Atajo por teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Atajo por teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Atajo por teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Pinchar para enfocar"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "El foco sigue al ratón"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Nuevo foco de ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automáticamente dar el foco a\n"
 "a las ventanas nuevas"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Levantar con el foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automáticamente levantar ventanas\n"
 "cuando tengan el foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Demora antes de levantar la ventana con foco :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lento"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rápido"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Levantar al pinchar"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Levantar la ventana cuando se pincha\n"
 "dentro de ella"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Atracción de las ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Pegar ventanas al borde del escritorio"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Atraer ventanas entre si"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distancia :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Pequeño"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Ancho"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Saltar al escritorio siguiente"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Saltar al siguiente escritorio al mover el puntero"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Saltar al siguiente escritorio al mover ventanas"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistencia en la orilla :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Redimensionado y movimiento opaco"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Mostrar el contenido al redimensionar"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostrar contenido de la ventana cuando se mueva"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Acción al pinchar dos veces"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Acción a realizar cuando se pincha dos veces en la barra de título :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automáticamente dar el foco a\n"
+"a las ventanas nuevas"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automáticamente levantar ventanas\n"
+"cuando tengan el foco"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Levantar la ventana cuando se pincha\n"
+"dentro de ella"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximizar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximizar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Ocultar ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Escritorio %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Saltar al escritorio siguiente"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Nuevo foco de ventana"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Atajo por teclado"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Atajo por teclado"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Atajo por teclado"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operación no activa (aún)\n"
@@ -505,114 +802,6 @@ msgstr "Cambiar a ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar ventana"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar ventana"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Nuevo foco de ventana"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Ocultar ventana"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Saltar al escritorio siguiente"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Escritorio %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Escritorio %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Estilo de Decorado"
 
diff --git a/po/eu.gmo b/po/eu.gmo
index 695b1d75f6b2a94ba410e49cac76ef3f4fc52d40..c1b390c8405ed2cd2d8cc1fb570ec30bafc01aa5 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index 540d4bf8474a16af97a521e2e7dbbd8fc51920b0..c8e54e07262faf9ca3ff838f8fafabe4d396d504 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,14 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 1996-01-26 02:39+0100\n"
 "Last-Translator: Piarres Beobide Egaña <pi@beobide.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -86,55 +86,58 @@ msgstr "Joan hurrengo idazmahaiera"
 msgid "Workspace names"
 msgstr "Idazmahai Marjinak"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menua"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Finkatu"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Bildu"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Handitu"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Itxi"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Bildu leihoa"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Ezkutatu leihoa"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Handitu leihoa"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Ezer ez"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Ezkerra"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Zentratuta"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Eskuina"
 
@@ -142,207 +145,501 @@ msgstr "Eskuina"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Izenburua"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Ezkutukoa"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Karaktere-joko Aukera lehioa"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Leiho Kudeatzailea"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Leiho Kudeatzailea hobespenak"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Izenburuaren karakter-jokoa"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Izenburua lerrokatu"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Izenburu barra barnean testu lerrokatzea :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Botoi-diseinua"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Izenburua"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Estilo de Ventana"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Teklatu lasterbideak"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Teklatu lasterbideak"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Teklatu lasterbideak"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Foku modelua"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Egin klik fokoa ezartzeko"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Fokoak arratoia jarraitzen du"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Leiho foko berria"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automatikoki ezarri fokoa\n"
 "leiho berrietan"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Bistaratu fokoaz"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automatikoki bistaratu leihoak\n"
 "fokoa dutenean"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Fokoa duen lehioa bistaratu arte itxarongo den denbora :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Motela"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Azkarra"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Bistaratu klikatzerakoan"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Bistaratu lehioa, honen barenan\n"
 "klikatzerakoan"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Foku modelua"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Leiho Itsaskarritasuna"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Itxasi leihoak pantaila ertzari"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Itsasi lehioak berien artean"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Tartea :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Txikia"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Zabala"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Joan hurrengo idazmahaiera"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Joan hurrengo idazmahaiera sagua pantaila ertzera ailatzerakoan"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Lehioak mugitzen hurrengo mahaigainera pasa"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Ertzaren erresistentzia :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Tamaina aldatza eta mugitze ikusezina"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Tamainaz aldatzean erakutsi leihoaren edukia"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mugitzerakoan  erakutsi leihoaren edukia"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Klik bikoitzaren ekintza"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Titulu barran bi aldiz klikatzerakoan egingo den ekintza :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automatikoki ezarri fokoa\n"
+"leiho berrietan"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automatikoki bistaratu leihoak\n"
+"fokoa dutenean"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Bistaratu lehioa, honen barenan\n"
+"klikatzerakoan"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Handitu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Handitu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Ezkutatu leihoa"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Joan hurrengo idazmahaiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Joan hurrengo idazmahaiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Joan hurrengo idazmahaiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Joan hurrengo idazmahaiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "%i Idazmahaia"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Joan hurrengo idazmahaiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Leiho foko berria"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Teklatu lasterbideak"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Teklatu lasterbideak"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Teklatu lasterbideak"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Ekintza ez da (oraindik) onartzen\n"
@@ -505,114 +802,6 @@ msgstr "Aldatu hona ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Handitu leihoa"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Handitu leihoa"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Leiho foko berria"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Leiho foko berria"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Leiho foko berria"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Ezkutatu leihoa"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Joan hurrengo idazmahaiera"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Joan hurrengo idazmahaiera"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Joan hurrengo idazmahaiera"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Joan hurrengo idazmahaiera"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "%i Idazmahaia"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "%i Idazmahaia"
-
 #~ msgid "Decoration style"
 #~ msgstr "Dekorazio estiloa"
 
diff --git a/po/fa_IR.gmo b/po/fa_IR.gmo
index 04b66e710f3db476d4ff0499196d562bfa5ce900..8e2c08a75c7dba6d911d7736f5f9af6167860ce8 100644
Binary files a/po/fa_IR.gmo and b/po/fa_IR.gmo differ
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 21905328d2b3013f86122f2a26a1275080aaa8e7..d9004d9c3a88e3c3e1c3d8686888eba5a016069b 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4.fa_IR\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-01-09 19:35+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.2\n"
 
 #: mcs-plugin/margins.c:122
@@ -82,55 +82,58 @@ msgstr "تعداد فضاهای کاری:"
 msgid "Workspace names"
 msgstr "نام‌های فضای‌کاری"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "فهرست"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "چسباندن"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "سایه"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "پنهان کردن"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "بزرگ‌سازی"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "بستن"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "سایه زدن پنجره"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "پنهان کردن پنجره"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "بزرگ‌سازی پنجره"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "هیچی"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Ú†Ù¾"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "مرکز"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "راست"
 
@@ -138,207 +141,501 @@ msgstr "راست"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "عنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "پنهان"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "گفتگوی گزینش قلم‌نگارش"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "مدیر پنجره‌"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "ترجیحات مدیر پنجره"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "قلم‌نگارش عنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "هم‌ترازی عنوان"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "هم‌ترازی متن درون نوار عنوان :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "طرح دکمه"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "عنوان"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "تمرکز پنجره‌ی جدید"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "میان‌بر صفحه‌کلید"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "میان‌بر صفحه‌کلید"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "میان‌بر صفحه‌کلید"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "مدل تمرکز"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "کلیک برای تمرکز"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "تمرکز بدنبال موشی"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "تمرکز پنجره‌ی جدید"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "تمرکز دادن خودکار به پنجره‌هایی \n"
 "که بتازگی ایجاد شده‌اند"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "برافرازی با تمرکز"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "برافرازی پنجره بطور خودکار وقتی \n"
 "آنها تمرکز را دریافت می‌کنند"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "آهسته"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "سریع"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "برافرازی با کلیک کردن"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "برافرازی پنجره وقتی داخل پنجره‌ی\n"
 "برنامه کلیک شود"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "مدل تمرکز"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "پنجره‌ربائی"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "ربودن پنجره به کنار صفحه"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "ربودن پنجره‌ها به پنجره‌های دیگر"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "فاصله :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Ú©ÙˆÚ†Ú©"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "پهن"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "پیچیدن فضاهای کاری"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "پیچیدن فضاهای کاری وقتی که پنجره‌ای به خارج از صفحه کشیده شود"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "مقاومت لبه :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "حرکت دادن آهسته و تغییر اندازه"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "عمل دوکلیکه"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "عملی که هنگام دوکلیکه کردن بر نوار عنوان انجام می‌گردد :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"تمرکز دادن خودکار به پنجره‌هایی \n"
+"که بتازگی ایجاد شده‌اند"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"برافرازی پنجره بطور خودکار وقتی \n"
+"آنها تمرکز را دریافت می‌کنند"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"برافرازی پنجره وقتی داخل پنجره‌ی\n"
+"برنامه کلیک شود"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "بزرگ‌سازی پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "بزرگ‌سازی پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "فضای کاری %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "میان‌بر صفحه‌کلید"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "میان‌بر صفحه‌کلید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "میان‌بر صفحه‌کلید"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: عملیات (هنوز) پشتیبانی ندارد\n"
@@ -500,114 +797,6 @@ msgstr "تعویض به ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "بزرگ‌سازی پنجره"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "بزرگ‌سازی پنجره"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "تمرکز پنجره‌ی جدید"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "تمرکز پنجره‌ی جدید"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "تمرکز پنجره‌ی جدید"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "پنهان کردن پنجره"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "پیچیدن فضاهای کاری"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "پیچیدن فضاهای کاری"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "پیچیدن فضاهای کاری"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "پیچیدن فضاهای کاری"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "فضای کاری %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "فضای کاری %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "سبک تزئین"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 3aa3eef5babd2e94929a3808b110cb56735a3025..84a22a479de2481a8c6c884c9fccf4c9e1c3cb0a 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 88e215d02f98a02ae5c21db8b6ca1174d7580916..f913601479c84340fffc4cdd0b0fd099cca53ec9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-05-27 22:53--200\n"
 "Last-Translator: Ilkka Ollakka <ilkka.j.ollakka@students.oamk.fi>\n"
 "Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -78,55 +78,58 @@ msgstr "Kierrätä työpöytiä"
 msgid "Workspace names"
 msgstr "Työpöydän marginaalit"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Valikko"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Kiinnitä"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Varjosta"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Piilota"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Suurenna"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Sulje"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Varjosta ikkuna"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Piilota ikkuna"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Suurenna ikkuna"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Vasen"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Keskellä"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Oikea"
 
@@ -134,207 +137,501 @@ msgstr "Oikea"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Otsikko"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Fontin valinta"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Ikkunamanageri"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Ikkunamanagerin Asetukset"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Otsikkofontti"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Otsikon tasaus"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Tekstin tasaus otsikkopalkin sisällä"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Nappien ulkoasu"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Otsikko"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Uuden ikkunan kohdistus"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Näppäinoikotiet"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Näppäinoikotiet"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Näppäinoikotiet"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Kohdistustapa"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Kohdistus painettaessa"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Kohdistus seuraa hiirtä"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Uuden ikkunan kohdistus"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automaattisesti kohdenna\n"
 "uusiin ikkunoihin"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Nosta kohdennuksessa"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automaattisesti nosta ikkuna \n"
 "kun se kohdistetaan"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Viive ennen tarkennetun ikkunan nostoa :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Hidas"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Nopea"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Nosta painettaessa"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Nosta ikkuna kun painetaan\n"
 "sovellusikkunan sisällä"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Kohdistustapa"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Ikkunoiden kiinnitys"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Liitä ikkunat näytön reunaan"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Liitä ikkunat toisiinsa"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Etäisyys :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Pieni"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Leveä"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Kierrätä työpöytiä"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Vaihda työpöytää kun osoitin menee reunan yli"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Kierrätä työpöytiä kun ikkuna raahataan ulos näytöstä"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Reunan vastus :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Päivitä työpöytää siirrettäessä tai muutettaessa ikkunan kokoa"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Päivitä ikkunan sisältöä kokoa muutettaessa"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Päivitä ikkunan sisältöä siirrettäessä"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Tuplaklikkaustoiminto"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Suoritettava toiminto tuplaklikatessa otsikkopalkkia:"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Muut"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automaattisesti kohdenna\n"
+"uusiin ikkunoihin"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automaattisesti nosta ikkuna \n"
+"kun se kohdistetaan"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Nosta ikkuna kun painetaan\n"
+"sovellusikkunan sisällä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Suurenna ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Suurenna ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Piilota ikkuna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Kierrätä työpöytiä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Kierrätä työpöytiä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Kierrätä työpöytiä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Kierrätä työpöytiä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Työpöytä %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Kierrätä työpöytiä"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Uuden ikkunan kohdistus"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Näppäinoikotiet"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Näppäinoikotiet"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Näppäinoikotiet"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Toiminto ei ole (vielä) tuettu\n"
@@ -496,114 +793,6 @@ msgstr "Siirrä ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Suurenna ikkuna"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Suurenna ikkuna"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Uuden ikkunan kohdistus"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Uuden ikkunan kohdistus"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Uuden ikkunan kohdistus"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Piilota ikkuna"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Kierrätä työpöytiä"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Kierrätä työpöytiä"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Kierrätä työpöytiä"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Kierrätä työpöytiä"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Työpöytä %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Työpöytä %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Koristelutyyli"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index e7c2f524a97a150567c0ddbed8f257af60a4b6d5..a8c707aa8a255f88cf0a099649e5fc65635e0660 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index fa91c0f3efa093f5a63ffc7c1ba22f8f88d28d2d..012e2b0d97e78be9c4196b6b23a791a685d1a8b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
-"PO-Revision-Date: 2004-08-04 18:50+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
+"PO-Revision-Date: 2004-08-07 22:24+0200\n"
 "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
 "Language-Team: none <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -82,253 +82,506 @@ msgstr "Nombre d'espaces de travail :"
 msgid "Workspace names"
 msgstr "Noms des espaces de travail"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Coller"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Enrouler"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Iconifier"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Agrandir"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Fermer"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Enrouler la fenêtre"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Iconifier la fenêtre"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Agrandir la fenêtre"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Aucun"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Gauche"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centre"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Droit"
 
 #: mcs-plugin/xfwm4_plugin.c:569
 msgid "Click and drag buttons to change the layout"
-msgstr "Cliquer et faire glisser les boutons pour\n"
+msgstr ""
+"Cliquer et faire glisser les boutons pour\n"
 "modifier l'agencement"
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr "Actifs"
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titre"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
-msgstr "The titre de fenêtre, ne peut être supprimé"
+msgstr "Le titre de la fenêtre, ne peut être supprimé"
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
-msgstr "Caché"
+msgstr "Éléments masqués"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Sélection de Fonte"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Préférences du gestionnaire de fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Fonte de titre"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alignement du titre"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alignement du texte dans la barre de titre :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Agencement des boutons"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 msgid "Style"
 msgstr "Style"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 msgid "Windows shortcuts"
 msgstr "Raccourcis de fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr "Commande"
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 msgid "Shortcut"
 msgstr "Raccourcis clavier"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 msgid "Command shortcuts"
 msgstr "Raccourcis de commandes"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modèle de focalisation"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Cliquer pour focaliser"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "La focalisation suit la souris"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Focus sur nouvelle fenêtre"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 msgid "Automatically give focus to newly created windows"
-msgstr ""
-"Focaliser automatiquement les nouvelles fenêtres"
+msgstr "Focaliser automatiquement les nouvelles fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Mettre au premier plan lors de la focalisation"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Mettre automatiquement au premier plan les fenêtres \n"
 "lorsqu'elles reçoivent le focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Délai avant la mise au premier plan :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lent"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rapide"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Mettre au premier plan lors d'un clic"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 msgid "Raise window when clicking inside application window"
-msgstr ""
-"Mettre au premier plan en cliquant dans la fenêtre"
+msgstr "Mettre au premier plan en cliquant dans la fenêtre"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 msgid "Focus"
 msgstr "Focalisation"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Aimantation des fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Accrocher les fenêtres aux bords de l'écran"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Accrocher les fenêtres aux autres fenêtres"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distance :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Petite"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Grande"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Basculer d'écran"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Basculer d'écran lorsque le pointeur arrive au bord"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Basculer d'écran en déplaçant une fenêtre au bord"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistance au bord :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Contenu visible durant le déplacement et redimensionnement"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Afficher le contenu durant le redimensionnement"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Afficher le contenu des fénêtres lors de leur déplacement"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Action du double clic"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Action à effectuer lors d'un double clic sur la barre de titre :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr "Focaliser automatiquement les nouvelles fenêtres"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Mettre automatiquement au premier plan les fenêtres \n"
+"lorsqu'elles reçoivent le focus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr "Mettre au premier plan en cliquant dans la fenêtre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+msgid "Close window"
+msgstr "Fermer la fenêtre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+msgid "Maximize window vertically"
+msgstr "Agrandir la fenêtre verticalement"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+msgid "Maximize window horizontally"
+msgstr "Agrandir la fenêtre horizontalement"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+msgid "Stick window"
+msgstr "Coller la fenêtre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+msgid "Cycle windows"
+msgstr "Basculer entre les fenêtres"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+msgid "Move window up"
+msgstr "Déplacer la fenêtre vers le haut"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+msgid "Move window down"
+msgstr "Déplacer la fenêtre vers le bas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+msgid "Move window left"
+msgstr "Déplacer la fenêtre vers la gauche"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+msgid "Move window right"
+msgstr "Déplacer la fenêtre vers la droite"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+msgid "Resize window up"
+msgstr "Retailler la fenêtre vers le haut"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+msgid "Resize window down"
+msgstr "Retailler la fenêtre vers le bas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+msgid "Resize window left"
+msgstr "Retailler la fenêtre vers la gauche"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+msgid "Resize window right"
+msgstr "Retailler la fenêtre vers la droite"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+msgid "Raise window"
+msgstr "Relever la fenêtre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+msgid "Lower window"
+msgstr "Abaisser la fenêtre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr "Basculer en mode plein écran"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+msgid "Next workspace"
+msgstr "Espace de travail suivant"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+msgid "Previous workspace"
+msgstr "Espace de travail précédent"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+msgid "Add workspace"
+msgstr "Ajouter un espace de travail"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+msgid "Delete workspace"
+msgstr "Supprimer un espace de travail"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+msgid "Workspace 1"
+msgstr "Espace de travail 1"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+msgid "Workspace 2"
+msgstr "Espace de travail 2"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+msgid "Workspace 3"
+msgstr "Espace de travail 3"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+msgid "Workspace 4"
+msgstr "Espace de travail 4"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+msgid "Workspace 5"
+msgstr "Espace de travail 5"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+msgid "Workspace 6"
+msgstr "Espace de travail 6"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+msgid "Workspace 7"
+msgstr "Espace de travail 7"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+msgid "Workspace 8"
+msgstr "Espace de travail 8"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+msgid "Workspace 9"
+msgstr "Espace de travail 9"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+msgid "Move window to next workspace"
+msgstr "Déplacer la fenêtre vers l'espace suivant"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+msgid "Move window to previous workspace"
+msgstr "Déplacer la fenêtre vers l'espace précédent"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+msgid "Move window to workspace 1"
+msgstr "Déplacer la fenêtre vers l'espace précédent 1"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+msgid "Move window to workspace 2"
+msgstr "Déplacer la fenêtre vers l'espace précédent 2"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+msgid "Move window to workspace 3"
+msgstr "Déplacer la fenêtre vers l'espace précédent 3"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+msgid "Move window to workspace 4"
+msgstr "Déplacer la fenêtre vers l'espace précédent 4"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+msgid "Move window to workspace 5"
+msgstr "Déplacer la fenêtre vers l'espace précédent 5"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+msgid "Move window to workspace 6"
+msgstr "Déplacer la fenêtre vers l'espace précédent 6"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+msgid "Move window to workspace 7"
+msgstr "Déplacer la fenêtre vers l'espace précédent 7"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+msgid "Move window to workspace 8"
+msgstr "Déplacer la fenêtre vers l'espace précédent 8"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+msgid "Move window to workspace 9"
+msgstr "Déplacer la fenêtre vers l'espace précédent 9"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr "Impossible d'ouvrir le répertoire de thèmes !"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+"Impossible d'ouvrir %s : \n"
+"%s"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+"Impossible d'écrire %s : \n"
+"%s"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr "Choisissez la commande"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+"Raccourci déjà utilisé !\n"
+"Êtes-vous sûr de vouloir l'utiliser ?"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+msgid "Compose shortcut for :"
+msgstr "Composer le raccourci pour :"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+msgid "Compose shortcut"
+msgstr "Composer le raccourci"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr "Impossible d'obtenir le clavier"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr "Choisissez la commande"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+msgid "Command :"
+msgstr "Commande :"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr "Cette commande n'existe pas ou le fichier n'est pas exécutable !"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr "Composer le raccourci pour la commande :"
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operation pas (encore) supportée\n"
@@ -492,174 +745,6 @@ msgstr "Basculer vers ..."
 msgid "Unknown application!"
 msgstr "Application inconnue!"
 
-#~ msgid "Close window"
-#~ msgstr "Fermer la fenêtre"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "Agrandir la fenêtre verticalement"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Agrandir la fenêtre horizontalement"
-
-#~ msgid "Stick window"
-#~ msgstr "Coller la fenêtre"
-
-#~ msgid "Cycle windows"
-#~ msgstr "Basculer entre les fenêtres"
-
-#~ msgid "Move window up"
-#~ msgstr "Déplacer la fenêtre vers le haut"
-
-#~ msgid "Move window down"
-#~ msgstr "Déplacer la fenêtre vers le bas"
-
-#~ msgid "Move window left"
-#~ msgstr "Déplacer la fenêtre vers la gauche"
-
-#~ msgid "Move window right"
-#~ msgstr "Déplacer la fenêtre vers la droite"
-
-#~ msgid "Resize window up"
-#~ msgstr "Retailler la fenêtre vers le haut"
-
-#~ msgid "Resize window down"
-#~ msgstr "Retailler la fenêtre vers le bas"
-
-#~ msgid "Resize window left"
-#~ msgstr "Retailler la fenêtre vers la gauche"
-
-#~ msgid "Resize window right"
-#~ msgstr "Retailler la fenêtre vers la droite"
-
-#~ msgid "Raise window"
-#~ msgstr "Relever la fenêtre"
-
-#~ msgid "Lower window"
-#~ msgstr "Abaisser la fenêtre"
-
-#~ msgid "Toggle fullscreen"
-#~ msgstr "Basculer en mode plein écran"
-
-#~ msgid "Next workspace"
-#~ msgstr "Espace de travail suivant"
-
-#~ msgid "Previous workspace"
-#~ msgstr "Espace de travail précédent"
-
-#~ msgid "Add workspace"
-#~ msgstr "Ajouter un espace de travail"
-
-#~ msgid "Delete workspace"
-#~ msgstr "Supprimer un espace de travail"
-
-#~ msgid "Workspace 1"
-#~ msgstr "Espace de travail 1"
-
-#~ msgid "Workspace 2"
-#~ msgstr "Espace de travail 2"
-
-#~ msgid "Workspace 3"
-#~ msgstr "Espace de travail 3"
-
-#~ msgid "Workspace 4"
-#~ msgstr "Espace de travail 4"
-
-#~ msgid "Workspace 5"
-#~ msgstr "Espace de travail 5"
-
-#~ msgid "Workspace 6"
-#~ msgstr "Espace de travail 6"
-
-#~ msgid "Workspace 7"
-#~ msgstr "Espace de travail 7"
-
-#~ msgid "Workspace 8"
-#~ msgstr "Espace de travail 8"
-
-#~ msgid "Workspace 9"
-#~ msgstr "Espace de travail 9"
-
-#~ msgid "Move window to next workspace"
-#~ msgstr "Déplacer la fenêtre vers l'espace suivant"
-
-#~ msgid "Move window to previous workspace"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 4"
-
-#~ msgid "Move window to workspace 5"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 5"
-
-#~ msgid "Move window to workspace 6"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 6"
-
-#~ msgid "Move window to workspace 7"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 7"
-
-#~ msgid "Move window to workspace 8"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 8"
-
-#~ msgid "Move window to workspace 9"
-#~ msgstr "Déplacer la fenêtre vers l'espace précédent 9"
-
-#~ msgid "Cannot open the theme directory !"
-#~ msgstr "Impossible d'ouvrir le répertoire de thèmes !"
-
-#~ msgid ""
-#~ "Cannot open %s : \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible d'ouvrir %s : \n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Cannot write in %s : \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible d'écrire %s : \n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Shortcut already in use !\n"
-#~ "Are you sure you want to use it ?"
-#~ msgstr ""
-#~ "Raccourci déjà utilisé !\n"
-#~ "Êtes-vous sûr de vouloir l'utiliser ?"
-
-#~ msgid "Compose shortcut for :"
-#~ msgstr "Composer le raccourci pour :"
-
-#~ msgid "Compose shortcut"
-#~ msgstr "Composer le raccourci"
-
-#~ msgid "Cannot grab the keyboard"
-#~ msgstr "Impossible d'obtenir le clavier"
-
-#~ msgid "Select command"
-#~ msgstr "Choisissez la commande"
-
-#~ msgid "Choose command"
-#~ msgstr "Choisissez la commande"
-
-#~ msgid "Command :"
-#~ msgstr "Commande :"
-
-#~ msgid "The command doesn't exist or the file is not executable !"
-#~ msgstr "Cette commande n'existe pas ou le fichier n'est pas exécutable !"
-
-#~ msgid "Compose shortcut for command :"
-#~ msgstr "Composer le raccourci pour la commande :"
-
 #~ msgid "Decoration style"
 #~ msgstr "Habillage"
 
diff --git a/po/hi.gmo b/po/hi.gmo
index 647c1f83e58d4d695a5581e6e0306be13a14b1e3..ba144f5c1767eefa3ec4e15ce4bf0fbdc5942d3c 100644
Binary files a/po/hi.gmo and b/po/hi.gmo differ
diff --git a/po/hi.po b/po/hi.po
index 9352818fbb05d7e4af5225cd9db1057fa09c7b7f..9eb0c2b206bb1717ff7f935ccc36e567cfb067cf 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4.hi.po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-11-01 18:18+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-group@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -83,55 +83,58 @@ msgstr "कार्यस्थान व्रेप करें"
 msgid "Workspace names"
 msgstr "कार्यस्थान हाशिया "
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "मेन्यू"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "स्टिक"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "छाया"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "छुपाएँ"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "अधिकतम"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "बंद करें"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "विंडो में छाया करें"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "विंडो छुपाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "विंडो को अधिकतम करें"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "कुछ नहीं"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "बांये"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "बीच में"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "दाँया"
 
@@ -139,200 +142,205 @@ msgstr "दाँया"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "शीर्षक"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "हिडन"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "फोंट चयन  संवाद"
 
 # gnome-session/splash.c:71
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "विन्डो प्रबंधक"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "विंडो प्रबंधक वरीयताएँ"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "शीर्षक फोंट"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "शीर्षक पंक्तिबद्धता"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "टाइटल बार के भीतर पाठ की पंक्तिबद्धताः"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "बटन लेआउट"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "शीर्षक"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "नया विंडो फोकस "
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "कीबोर्ड शार्टकट"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "कीबोर्ड शार्टकट"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "कीबोर्ड शार्टकट"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "फोकस माडल"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "फोकस देने हेतु क्लिक करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "फोकस माउस के पीछे"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "नया विंडो फोकस "
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "नए बने हुए विंडो में  \n"
 "स्वतः फोकस दें"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "फोकस पर उठाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "जब विंडो में फोकस प्राप्त हो \n"
 "तो विंडो स्वतः उठाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "फोकस किए विंडो को ऊपर लाने से पहले विलम्ब"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "धीमा"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "तेज"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "क्लिक पर उठाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "जब भीतर क्लिक करें तो विंडो उठाएं\n"
 "अनुप्रयोग विंडो"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "फोकस माडल"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "विंडोस स्नेपिंग"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "विंडोस को स्क्रीन बार्डर में स्नेप करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "विंडोस को अन्य विंडोस में स्नेप करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "दूरी :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "छोटा"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "चौड़ा"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "कार्यस्थान व्रेप करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "जब स्क्रीन के बाहर विंडो को खींचें तो कार्यस्थानों को व्रेप करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "किनारा प्रतिरोध :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "अपारदर्शी हटाएं एवं आकार परिवर्तन करें"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "डबल क्लिक करने पर क्रिया"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "टाइटल बार में डबल क्लिक करने पर क्रिया निष्पादन :"
 
@@ -341,11 +349,300 @@ msgstr "टाइटल बार में डबल क्लिक करन
 # libgnome-desktop/gnome-ditem-edit.c:776
 # #-#-#-#-#  gnome-desktop.HEAD.hi.po (gnome-desktop-2.0.hi)  #-#-#-#-#
 # libgnome-desktop/gnome-ditem-edit.c:776
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "उन्नत"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"नए बने हुए विंडो में  \n"
+"स्वतः फोकस दें"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"जब विंडो में फोकस प्राप्त हो \n"
+"तो विंडो स्वतः उठाएं"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"जब भीतर क्लिक करें तो विंडो उठाएं\n"
+"अनुप्रयोग विंडो"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "विंडो को अधिकतम करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "विंडो को अधिकतम करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "विंडो छुपाएं"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "कार्यस्थान व्रेप करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "कार्यस्थान व्रेप करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "कार्यस्थान व्रेप करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "कार्यस्थान व्रेप करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "कार्यस्थान %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "कार्यस्थान व्रेप करें"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "नया विंडो फोकस "
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "कीबोर्ड शार्टकट"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "कीबोर्ड शार्टकट"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "कीबोर्ड शार्टकट"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: आपरेशन हेतु समर्थन उपलब्ध नहीं (अभी) \n"
@@ -508,114 +805,6 @@ msgstr "पर स्विच करें..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "विंडो को अधिकतम करें"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "विंडो को अधिकतम करें"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "नया विंडो फोकस "
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "नया विंडो फोकस "
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "नया विंडो फोकस "
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "विंडो छुपाएं"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "कार्यस्थान व्रेप करें"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "कार्यस्थान व्रेप करें"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "कार्यस्थान व्रेप करें"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "कार्यस्थान व्रेप करें"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "कार्यस्थान %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "कार्यस्थान %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "सजावट प्रकार"
 
diff --git a/po/hu.gmo b/po/hu.gmo
index bde17461c7f8b5875b6a3d57fce700bc218bff25..9c6e7fd936c939152d56b5b1a8ded18da4c12f8e 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 66e6567064a7fc4ef83144aa179985a03456b18a..7580753b745ba73c628716cffb7ebc66e856e543 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-07-16 16:19+0200\n"
 "Last-Translator: Egmont Koblinger <egmont@uhulinux.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0.1\n"
 
@@ -87,55 +87,58 @@ msgstr "Munkaterület-váltás"
 msgid "Workspace names"
 msgstr "Munkaterület-margók"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menü"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Megjelenés minden munkaterületen"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Felgördítés"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximalizálás"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Bezárás"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Ablak felgördítése"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Ablak minimalizálása"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Ablak maximalizálása"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Semmi"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Balra"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Középre"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Jobbra"
 
@@ -143,207 +146,501 @@ msgstr "Jobbra"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Cím"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Elrejtve"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Betűkészlet-kijelölés párbeszédablak"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Ablakkezelő"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Ablakkezelő beállításai"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Címsor betűkészlete"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Címsor igazítása"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Szöveg igazítása a címsorban:"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Gombok elrendezése"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Cím"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Új ablak fókusza"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Gyorsbillentyű"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Gyorsbillentyű"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Gyorsbillentyű"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Fókusz"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Kattintás a fókuszhoz"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "A fókusz az egeret követi"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Új ablak fókusza"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Újonnan létrehozott ablakok\n"
 "automatikusan fókuszt kapnak"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Fókuszkor előhozás"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Ablakok automatikus előhozása,\n"
 "amikor fókuszt kapnak"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "A fókuszban levő ablak előhozásának késleltetése:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Hosszú"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rövid"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Kattintásra előhozás"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Ablak előhozása az\n"
 "alkalmazás ablakába kattintáskor"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Fókusz"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Ablakillesztés"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Ablakok illesztése a képernyő széléhez"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Ablakok egymáshoz való illesztése"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Távolság:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Kicsi"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Nagy"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Munkaterület-váltás"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Munkaterület-váltás, amikor a mutató a képernyő széléhez ér"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Munkaterület-váltás, amikor egy ablakot a képernyőről lehúz"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Szélek ellenállása:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Áttetsző mozgatás és átméretezés"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Ablak tartalmának megjelenítése átméretezés közben"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Ablak tartalmának megjelenítése mozgatás közben"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Kettős-kattintásra elvégzendő művelet"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "A címsoron kettős-kattintásra elvégezendő művelet"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Újonnan létrehozott ablakok\n"
+"automatikusan fókuszt kapnak"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Ablakok automatikus előhozása,\n"
+"amikor fókuszt kapnak"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Ablak előhozása az\n"
+"alkalmazás ablakába kattintáskor"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Ablak maximalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Ablak maximalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Ablak minimalizálása"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Munkaterület-váltás"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Munkaterület-váltás"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Munkaterület-váltás"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Munkaterület-váltás"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "%i. munkaterület"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Munkaterület-váltás"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Új ablak fókusza"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Gyorsbillentyű"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Gyorsbillentyű"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Gyorsbillentyű"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Nem támogatott művelet (egyelőre)\n"
@@ -505,114 +802,6 @@ msgstr "Váltás..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Ablak maximalizálása"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Ablak maximalizálása"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Új ablak fókusza"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Új ablak fókusza"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Új ablak fókusza"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Ablak minimalizálása"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Munkaterület-váltás"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Munkaterület-váltás"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Munkaterület-váltás"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Munkaterület-váltás"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "%i. munkaterület"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "%i. munkaterület"
-
 #~ msgid "Decoration style"
 #~ msgstr "Díszítés stílusa"
 
diff --git a/po/it.gmo b/po/it.gmo
index e2bc2162bbcc35b5abdc84876e6943335d0fcb20..6ac37b29833e265086e670808e258d5c1827b2e8 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 94a46696fbb9a923403f4c9c6766810e88529a01..d6be5afbde47fa63df21dc3247f1174eeb37851c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XFce4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-03-11 14:02+0100\n"
 "Last-Translator: Alex Dupre <ale@FreeBSD.org>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -85,55 +85,58 @@ msgstr "Scorri gli spazi di lavoro"
 msgid "Workspace names"
 msgstr "Bordi dello spazio di lavoro"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Blocca"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Adombra"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Chiudi"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Adombra la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Nascondi la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Massimizza la finestra"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Niente"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Sinistra"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centro"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Destra"
 
@@ -141,209 +144,503 @@ msgstr "Destra"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titolo"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Seleziona il Font"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gestore di Finestre"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Impostazioni del Gestore di Finestre"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Font per il titolo"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Allineamento del titolo"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Allineamento del testo all'interno della barra del titolo :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Disposizione dei bottoni"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Titolo"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Focus alle nuove finestre"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Scorciatoie da Tastiera"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Scorciatoie da Tastiera"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Scorciatoie da Tastiera"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modello di focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Clicca per avere il focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Il focus segue il mouse"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Focus alle nuove finestre"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Attribuisci il focus automaticamente\n"
 "alle finestre appena create"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Porta in primo piano al focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Porta automaticamente in primo piano le finestre\n"
 "quando ricevono il focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Ritardo per portare in primo piano la finestra col focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lento"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Veloce"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Portare in primo piano al click"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Portare in primo piano la finestra\n"
 "quando si clicca all'interno"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Modello di focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Disposizione delle finestre"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Bordi dello schermo magnetici"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Bordi delle finestre magnetiche"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distanza :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Piccolo"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Ampio"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Scorri gli spazi di lavoro"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 "Scorri gli spazi di lavoro se il puntatore raggiunge il bordo dello schermo"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 "Scorri gli spazi di lavoro se una finestra viene spostata fuori dallo schermo"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistenza ai Bordi :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Spostamento e ridimensionamento opaco"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Mostra il contenuto delle finestre quando vengono ridimensionate"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostra il contenuto delle finestre quando vengono spostate"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Azione per il doppio click"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Azione da intraprendere per il doppio click sulla barra del titolo :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Attribuisci il focus automaticamente\n"
+"alle finestre appena create"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Porta automaticamente in primo piano le finestre\n"
+"quando ricevono il focus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Portare in primo piano la finestra\n"
+"quando si clicca all'interno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Massimizza la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Massimizza la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Nascondi la finestra"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Scorri gli spazi di lavoro"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Scorri gli spazi di lavoro"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Scorri gli spazi di lavoro"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Scorri gli spazi di lavoro"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Spazio di lavoro %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Scorri gli spazi di lavoro"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Focus alle nuove finestre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Scorciatoie da Tastiera"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Scorciatoie da Tastiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Scorciatoie da Tastiera"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operazione non (ancora) implementata\n"
@@ -505,114 +802,6 @@ msgstr "Passa a ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Massimizza la finestra"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Massimizza la finestra"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Focus alle nuove finestre"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Focus alle nuove finestre"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Focus alle nuove finestre"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Nascondi la finestra"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Scorri gli spazi di lavoro"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Scorri gli spazi di lavoro"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Scorri gli spazi di lavoro"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Scorri gli spazi di lavoro"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Spazio di lavoro %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Spazio di lavoro %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Stile delle decorazioni"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index f14f49c20719bec08b907290b34c04a8e2cd2257..7452bf38429c1faf1ba1850564b4db6b9d63bc9e 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index fa1186414ee87e532d20229f12cdbc1ababbe4f8..a10588ad18e833fd002b726beeea6fe707370d60 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-12-10 14:20+0900\n"
 "Last-Translator: Zhao Ji <zhao-ji@awz.ne.jp>\n"
 "Language-Team: xfce-users-jp <xfce-users-jp@ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -83,55 +83,58 @@ msgstr "ワークスペース循環"
 msgid "Workspace names"
 msgstr "ワークスペース・マージン"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "メニュー"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "貼り付け"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "折りたたみ"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "隠す"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "最大化"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "閉じる"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "ウィンドウを折りたたむ"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "ウィンドウを隠す"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "ウィンドウの最大化"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "なし"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "å·¦"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "中央"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "右"
 
@@ -139,207 +142,501 @@ msgstr "右"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "タイトル"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "隠す"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "フォント選択ダイアログ"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "ウィンドウ・マネージャ"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "ウィンドウ・マネージャ設定"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "タイトル・フォント"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "タイトル位置"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "タイトルバー内のテキスト位置 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "ボタン配置"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "タイトル"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "ウィンドウ・スタイル"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "キーボード・ショートカット"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "キーボード・ショートカット"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "キーボード・ショートカット"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "フォーカス・モデル"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "クリックでフォーカス"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "マウスを追ってフォーカス"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "新規ウィンドウのフォーカス"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "新規作成されたウィンドウを  \n"
 "自動でフォーカス"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "フォーカスで最前面"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "ウィンドウがフォーカスを取得\n"
 "した時に、自動で最前面にする"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "フォーカスを取得後、最前面へする遅延 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "遅い"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "速い"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "クリックで最前面"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "アプリケーション・ウィンドウ内で \n"
 "クリックして最前面"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "フォーカス・モデル"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "ウィンドウ・スナップ"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "スクリーン境界でウィンドウを止める"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "他のウィンドウでウィンドウを止める"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "距離 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "狭い"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "広い"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "ワークスペース循環"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "ポインターがスクリーン端に来たら、ワークスペースを循環"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "スクリーンでウィンドウをドラッグ中、ワークスペースを循環"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "エッジ抵抗 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "不透明表示の移動とサイズ変更"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "サイズ変更時のウィンドウ表示"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "移動時のウィンドウ表示"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "ダブルクリック動作"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "タイトルバーをダブルクリックした時の動作 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "上級"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"新規作成されたウィンドウを  \n"
+"自動でフォーカス"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"ウィンドウがフォーカスを取得\n"
+"した時に、自動で最前面にする"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"アプリケーション・ウィンドウ内で \n"
+"クリックして最前面"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "ウィンドウの最大化"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "ウィンドウの最大化"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "ウィンドウを隠す"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "ワークスペース循環"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "ワークスペース循環"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "ワークスペース循環"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "ワークスペース循環"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "ワークスペース %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "ワークスペース循環"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "新規ウィンドウのフォーカス"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "キーボード・ショートカット"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "キーボード・ショートカット"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "キーボード・ショートカット"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: この操作はサポート外です\n"
@@ -501,114 +798,6 @@ msgstr "切替え..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "ウィンドウの最大化"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "ウィンドウの最大化"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "新規ウィンドウのフォーカス"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "新規ウィンドウのフォーカス"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "新規ウィンドウのフォーカス"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "ウィンドウを隠す"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "ワークスペース循環"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "ワークスペース循環"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "ワークスペース循環"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "ワークスペース循環"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "ワークスペース %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "ワークスペース %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "装飾スタイル"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index 1ef3577a5ac8d927f0a4b15f95919a40ad64d225..357caeaadb1521b0d024f5ddf9353eeac3149c46 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index ad8b9c2ec1880de2ee1d4b8bd001811749c77656..c5b43c090d0e78f0f79eddfa937f26c227b32642 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-08-02 03:36+0900\n"
 "Last-Translator: ByungHyun Choi<byunghyunchoi@rtlinux.or.kr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -84,55 +84,58 @@ msgstr "작업공간의 수:"
 msgid "Workspace names"
 msgstr "작업공간 여백"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "메뉴"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "모든 작업공간에 보이기"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "말아올리기"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "숨기기"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "최대화"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "닫기"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "창 말아올리기"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "창 숨기기"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "창 최대화"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "아무 짓도 안함"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "좌측"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "가운데"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "우측"
 
@@ -140,201 +143,489 @@ msgstr "우측"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "제목"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "숨김"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "글꼴 선택"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "창 관리자"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "창 관리자 속성 설정"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "창 제목 글꼴"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "창 제목 정렬"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "제목 틀의 내용 정렬"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "버튼 배치"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "제목"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "새로운 창 활성 방법"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "단축키"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "단축키"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "단축키"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "창 활성 방법"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "클릭"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "마우스를 따라가기"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "새로운 창 활성 방법"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr "새로운 창은 무조건 활성"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "활성된 창 올리기"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr "활성된 창은 무조건 최상위로 올리기"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "지연 시간"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "느림"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "빠름"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "클릭했을 때 창 올리기"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr "창 내부를 클릭해야 올림"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "창 활성 방법"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "창 움직임"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "화면 경계에 따라 움직임"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "다른 창에 맞추어 움직임"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "거리 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "좁게"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "넓게"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "작업 공간 전환"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "마우스 포인터가 화면 모서리에 닿으면 작업공간 전환"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "창을 화면 밖으로 이동시키면 작업공간 전환"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "화면 모서리 저항 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "창 이동 및 크기 변경"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "창 크기를 변경할 때 내용을 보이기"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "창을 움직일 때 내용 보이기"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "더블클릭하면"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "제목 틀을 더블클릭한 경우 취하는 동작"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "고급 설정"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr "새로운 창은 무조건 활성"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr "활성된 창은 무조건 최상위로 올리기"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr "창 내부를 클릭해야 올림"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "창 최대화"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "창 최대화"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "창 숨기기"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "작업 공간 전환"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "작업 공간 전환"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "작업 공간 전환"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "작업 공간 전환"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "작업공간 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "작업 공간 전환"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "새로운 창 활성 방법"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "단축키"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "단축키"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "단축키"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
@@ -496,114 +787,6 @@ msgstr "작업공간 전환"
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "창 최대화"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "창 최대화"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "새로운 창 활성 방법"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "새로운 창 활성 방법"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "새로운 창 활성 방법"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "창 숨기기"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "작업 공간 전환"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "작업 공간 전환"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "작업 공간 전환"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "작업 공간 전환"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "작업공간 %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "작업공간 %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "꾸미기"
 
diff --git a/po/lt.gmo b/po/lt.gmo
index 2bb5c25a6422ef93db325a3b23b92306c23cc6d3..cec14b166e545d49e613a0dcc7d46bbda973cd57 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index 37e20a08612261598c4858ed536030aaf72be59e..a8136b7f6a7184ce7dec1e3fb2f99fcc597c20e2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 3.99.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-06-11 23:09+0300\n"
 "Last-Translator: Mantas <zaz@xxx.lt>\n"
 "Language-Team: Lithuania <komp_lt@konf.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -79,55 +79,58 @@ msgstr "Darbo vietų skaičius:"
 msgid "Workspace names"
 msgstr "Darbo vietos pavadinimai"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Meniu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Prisegti"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Šešėlis"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "PaslÄ—pti"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "išskleisti"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Uždaryti"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Uždengti langą"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "PaslÄ—pti langÄ…"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "išskleisti langą"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nieko"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "KairÄ—"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centras"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Dešinė"
 
@@ -135,207 +138,502 @@ msgstr "Dešinė"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Slepiamas"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Å rifto pasirinkimo dialogas"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Langų tvarkyklė"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Langų tvarkyklės nuostatos"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Pavadinimo Å¡riftas"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Pavadinimo lygiavimas"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Teksto lygiavimas pavadinimo juostoje :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Mygtukų išdėstymas"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Pavadinimas"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Naujas langas dÄ—mesio centre"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Klaviatūros nuoroda"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Klaviatūros nuoroda"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Klaviatūros nuoroda"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Fokusavimo modelis"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Spauskite norÄ—dami fokusuoti"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "DÄ—mesys sutelkiamas pagal pelÄ—s pozicijÄ…"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Naujas langas dÄ—mesio centre"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Atomatiškai sutelkti dėmesį \n"
 "į naujai sukurtus langus"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "aiškelti kai fokusuojama"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automatiškai iškelti langus\n"
 "kai jie dÄ—mesio centre"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Užlaikyti prieš iškeliant fokusuotą langą :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "LÄ—tai"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Greitai"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "IÅ¡kelti paspaudus"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Iškelti langą kai spaudžiama viduje\n"
 "programos lango"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Fokusavimo modelis"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Langų pritraukimas"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Užsklęsti langą į ekrano sieną"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Pritraukti langus prie kitų langų"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Atstumas :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Mažas"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Plotis"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Laužyti darbo vietas"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Laužyti darbo vietas kai žymeklis pasiekia ekrano kraštą"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Laužyti darbo vietas kai tempiamas langas yra už ekrano"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Kraštų atsparumas :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Nepermatomas perkėlimas ir dydžio pakeitimas"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Keičiant lango dydį rodyti jo turinį"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Perkeliant langą rodyti jo turinį"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Veiksmas dukart spragtelÄ—ti"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Veiskmas kuris bus atliktas dukart spragtelÄ—jus ant pavadinimo juostos"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "IÅ¡plÄ—stas"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Atomatiškai sutelkti dėmesį \n"
+"į naujai sukurtus langus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automatiškai iškelti langus\n"
+"kai jie dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Iškelti langą kai spaudžiama viduje\n"
+"programos lango"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "išskleisti langą"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "išskleisti langą"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "PaslÄ—pti langÄ…"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+#, fuzzy
+msgid "Toggle fullscreen"
+msgstr "Neįmanoma gauti pagrindinio ekrano"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Laužyti darbo vietas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Laužyti darbo vietas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Laužyti darbo vietas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Laužyti darbo vietas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Darbo laukas %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Laužyti darbo vietas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Naujas langas dÄ—mesio centre"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Klaviatūros nuoroda"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Klaviatūros nuoroda"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Klaviatūros nuoroda"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operacija nÄ—ra palaikoma (kolkas)\n"
@@ -497,118 +795,6 @@ msgstr "Perjungti į ..."
 msgid "Unknown application!"
 msgstr "Nežinoma programa!"
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "išskleisti langą"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "išskleisti langą"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Naujas langas dÄ—mesio centre"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Naujas langas dÄ—mesio centre"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Naujas langas dÄ—mesio centre"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "PaslÄ—pti langÄ…"
-
-#, fuzzy
-#~ msgid "Toggle fullscreen"
-#~ msgstr "Neįmanoma gauti pagrindinio ekrano"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Laužyti darbo vietas"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Laužyti darbo vietas"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Laužyti darbo vietas"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Laužyti darbo vietas"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Darbo laukas %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Darbo laukas %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Dekoravimo stilius"
 
diff --git a/po/ms.gmo b/po/ms.gmo
index c70530ed131de034224ad53408b4b3e675da703d..48450aac74abb6a32c27f3448f7cc76ee4de2f33 100644
Binary files a/po/ms.gmo and b/po/ms.gmo differ
diff --git a/po/ms.po b/po/ms.po
index 399c0c611fea9eb1d063a46c74aacfea370b4cf3..b826b396c3641021fde0790e4105703644ce430d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.0.3.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-02-08 00:28+0800\n"
 "Last-Translator: Harun Musa <mharun@gmx.net>\n"
 "Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -79,55 +79,58 @@ msgstr "Bilangan ruangkerja:"
 msgid "Workspace names"
 msgstr "Nama ruangkerja"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Lekat"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Bayang"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Sembunyi"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maksimakan"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Tutup"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Bayang tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Sembunyi tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maksimakan tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Tiada apa"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Kiri"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Tengah"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Kanan"
 
@@ -135,207 +138,501 @@ msgstr "Kanan"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Tajuk"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Sembunyi"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Dialog Pemilihan Font"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Pengurus Tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Keutamaan Pengurus Tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Tajuk font"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Penjajaran Tajuk"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Penjajaran teks didalam bar tajuk :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Layout bebutang"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Tajuk"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Fokus tetingkap baru"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Pintasan Papankekunci"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Pintasan Papankekunci"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Pintasan Papankekunci"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Model fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Klik untuk fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Fokus mengikuti tetikus"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Fokus tetingkap baru"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automatik beri fokus kepada \n"
 "tetingkap baru dicipta"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Bangkit ketika fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automatik tetingkap bangkit \n"
 "bila menerima fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Lengah sebelum bangkitkan tetingkap difokus :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Perlahan"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Pantas"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Bangkit ketika klik"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Tetingkap bangkit ketika klik didalam\n"
 "tetingkap aplikasi"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Model fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Snapping tetingkap"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Snap tetingkap ke sempadan skrin"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Snap tetingkap ke tetingkap lain"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Jarak :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Kecil"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Luas"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Wrap ruangkerja"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Wrap ruangkerja bila penunjuk mencapai sisi skrin"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Wrap ruangkerja bila seretkan tetingkap keluar skrin"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Halangan Sisi :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Opaque pindah dan saizsemula"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Aksi dwi klik"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Aksi untuk dilakukan apabila dwiklik pada bar tajuk :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Lanjutan"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automatik beri fokus kepada \n"
+"tetingkap baru dicipta"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automatik tetingkap bangkit \n"
+"bila menerima fokus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Tetingkap bangkit ketika klik didalam\n"
+"tetingkap aplikasi"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maksimakan tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maksimakan tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Sembunyi tetingkap"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Wrap ruangkerja"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Wrap ruangkerja"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Wrap ruangkerja"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Wrap ruangkerja"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Ruangkerja %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Wrap ruangkerja"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Fokus tetingkap baru"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Pintasan Papankekunci"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Pintasan Papankekunci"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Pintasan Papankekunci"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operasi tidak disokong (lagi)\n"
@@ -497,114 +794,6 @@ msgstr "Suis ke ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maksimakan tetingkap"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maksimakan tetingkap"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Fokus tetingkap baru"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Fokus tetingkap baru"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Fokus tetingkap baru"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Sembunyi tetingkap"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Wrap ruangkerja"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Wrap ruangkerja"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Wrap ruangkerja"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Wrap ruangkerja"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Ruangkerja %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Ruangkerja %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Stail dekorasi"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 66d71ebb624d343666e2fafa24a66e3fd0d6bd92..089abf3914b8910a749bc93c3ea0969a6b75b112 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 43cdcaebb3f5e9e348b696a09edb7e681233bd6a..f44a57925e2451ba3a7a956e6a93e071bc06f9b1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jasper Huijsmans <huysmans@users.sourceforge.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -86,55 +86,58 @@ msgstr "Wissel bureaublad"
 msgid "Workspace names"
 msgstr "Bureaublad Marges"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Plakken"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Oprollen"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Sluiten"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Venster oprollen"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Venster verbergen"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Venster maximaliseren"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Niets"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Links"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Midden"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Rechts"
 
@@ -142,206 +145,498 @@ msgstr "Rechts"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titel"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Lettertype selecteren"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Window Manager"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Window Manager Opties"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Lettertype titel"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Uitlijning titel"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Uitlijning tekst in titelbalk"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Knopvolgorde"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Titel"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Venster stijl"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Sneltoetsen"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Sneltoetsen"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Sneltoetsen"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Vensterfocus"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Klik voor focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Focus volgt muis"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Focus voor nieuwe vensters"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Nieuwe venster krijgen focus \n"
 "automatisch"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Naar voren halen bij focus"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr "Venster met focus naar voren halen"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Vertraging voor naar voren halen vensters :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Langzaam"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Snel"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Naar voren halen bij klik"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Venster naar voren halen bij klikken\n"
 "in het venster"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Vensterfocus"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Aantrekken vensters"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Vensters naar schermranden trekken"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Vensters naar andere vensters trekken"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Afstand :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Klein"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Groot"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Wissel bureaublad"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 "Wissel bureaubladen wanneer de muisaanwijzer de rand van het scherm bereikt"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Wissel bureaubladen bij slepen voorbij de rand van het scherm"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Weerstand :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Inhoud tonen bij verplaatsen en formaat aanpassen"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Inhoud venster tonen bij veranderen grootte"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Inhoud venster tonen bij verplaatsen"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Dubbelklik actie"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Actie voor dubbelklikken op de titelbalk :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Nieuwe venster krijgen focus \n"
+"automatisch"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr "Venster met focus naar voren halen"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Venster naar voren halen bij klikken\n"
+"in het venster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Venster maximaliseren"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Venster maximaliseren"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Venster verbergen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Wissel bureaublad"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Wissel bureaublad"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Wissel bureaublad"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Wissel bureaublad"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Bureaublad %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Wissel bureaublad"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Focus voor nieuwe vensters"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Sneltoetsen"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Sneltoetsen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Sneltoetsen"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Bewerking (nog) niet ondersteund\n"
@@ -503,114 +798,6 @@ msgstr "Wisselen naar ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Venster maximaliseren"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Venster maximaliseren"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Focus voor nieuwe vensters"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Focus voor nieuwe vensters"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Focus voor nieuwe vensters"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Venster verbergen"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Wissel bureaublad"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Wissel bureaublad"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Wissel bureaublad"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Wissel bureaublad"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Bureaublad %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Bureaublad %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Vensterdecoratie"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index b48d2aa5bf84dd37f9b027d800346bb5f4b59c87..6cb97443667e3b248f4f31e8af26e1cc627b275d 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 4e4d2ff8c129140e6cd436599cbb62641e2de800..11d41e4a205a9b422a647d1421ffeadb7a338473 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-12-25 19:40+0100\n"
 "Last-Translator: Daniel Mróz <beorn@alpha.pl>\n"
 "Language-Team: none <none@none>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -89,55 +89,58 @@ msgstr "Zmiana obszaru roboczego"
 msgid "Workspace names"
 msgstr "Marginesy Obszaru Roboczego"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Przypnij"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Zwiń"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Zamknij"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Zwiń okno"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Schowaj okno"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maksymalizuj okno"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nic"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Lewo"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Åšrodek"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Prawo"
 
@@ -145,207 +148,501 @@ msgstr "Prawo"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Tytuł"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Okno Wyboru Czcionki"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Menadżer Okien"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Właściwości Menadżera Okien"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Czionka tytułowa"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Wyrównanie Tytułu"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Wyrównanie tekstu wewnątrz paska tytułowego :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Rozmieszczenie przycisków"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Tytuł"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Styl okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Skrót klawiszowy"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Skrót klawiszowy"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Skrót klawiszowy"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Sposób aktywacji"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Kliknij aby aktywować"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Aktywacja podąża za myszką"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Aktywacja nowego okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Automatycznie aktywuj nowo \n"
 "utworzone okna"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "PrzenieÅ› na wierzch po aktywacji"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automatycznie przenieÅ› na wierzch okno \n"
 "kiedy zostanie uaktywnione"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Opóźnienie przeniesienia na wierzch aktywowanego okna :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Wolno"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Szybko"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Przenieś na wierzch po kliknięciu"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Przenieś na wierzch po kliknięciu\n"
 "wewnÄ…trz okna aplikacji"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Sposób aktywacji"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "PrzyciÄ…ganie okien"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Przyciągaj okna do krawędzi ekranu"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "PrzyciÄ…gaj okna do innych okien"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Odległość :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Mała"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Duża"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Zmiana obszaru roboczego"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Przełącz obszar roboczy gdy kursor osiągnie krawędź ekranu"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Przełącz obszar roboczy podczas przesuwania okna poza ekran"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Bezwładność Krawędzi :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Okno podczas przesuwania i zmiany rozmiaru"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Wyświetlaj zawartość okien podczas zmiany wielkości"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Wyświetlaj zawartość okien podczas przesuwania"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Akcja przy podwójnym kliknięciu"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Akcja do wykonania przy podwójnym kliknięciu na pasku tytułowym :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Automatycznie aktywuj nowo \n"
+"utworzone okna"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automatycznie przenieÅ› na wierzch okno \n"
+"kiedy zostanie uaktywnione"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Przenieś na wierzch po kliknięciu\n"
+"wewnÄ…trz okna aplikacji"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maksymalizuj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maksymalizuj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Schowaj okno"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Zmiana obszaru roboczego"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Zmiana obszaru roboczego"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Zmiana obszaru roboczego"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Zmiana obszaru roboczego"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Zmiana obszaru roboczego"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Aktywacja nowego okna"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Skrót klawiszowy"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Skrót klawiszowy"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Skrót klawiszowy"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operaracja jeszcze nie obsługiwana\n"
@@ -508,114 +805,6 @@ msgstr "Przełącz do ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maksymalizuj okno"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maksymalizuj okno"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Aktywacja nowego okna"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Aktywacja nowego okna"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Aktywacja nowego okna"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Schowaj okno"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Zmiana obszaru roboczego"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Zmiana obszaru roboczego"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Zmiana obszaru roboczego"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Zmiana obszaru roboczego"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Obszar roboczy %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Obszar roboczy %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Styl dekorowania"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index eba67fd096ec284d0dbf9879f83fd8e0e5ab27ba..5a82f17f971c059cbbfb299e178abc3e3db8361e 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 95ae631090524e70b43042fd88e85f060a074ebe..3da411085fabf0a8bdad9e4d2f596a39ade46400 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-01-18 00:16-0200\n"
 "Last-Translator: Felix da Silva Costa <felix@online.eti.br>\n"
 "Language-Team: pt_BR <felix@online.eti.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -80,55 +80,58 @@ msgstr "Número de áreas de trabalho:"
 msgid "Workspace names"
 msgstr "Nome da área de trabalho"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Fixar"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Sombra"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Esconder"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Fechar"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Sombrear janela"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Esconder janela"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximizar janela"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nada"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Esquerdo"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centro"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Direito"
 
@@ -136,208 +139,502 @@ msgstr "Direito"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Oculto"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Diálogo de seleção de fontes"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gerenciador de janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Preferências do gerenciador de janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Fonte do título"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alinhamento do título"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alinhamento do texto dentro da barra de títulos :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Disposição dos botôes"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Foco em novas janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Teclas de atalho"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Teclas de atalho"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Teclas de atalho"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Foco ao clicar"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Foco segue o mouse"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Foco em novas janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Aututomaticamente dê foco \n"
 "em novas janelas criadas"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Foco ao aumentar"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Automaticamente aumente a janela \n"
 "quando elas receberem foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Atraso antes de aumentar janelas com foco :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lento"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rápido"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Aumentar ao clique"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Aumentar a janela ao clicar dentro \n"
 "da janela da aplicação"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Modelo de foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distância :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Pequeno"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Largo"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 #, fuzzy
 msgid "Wrap workspaces"
 msgstr "Mudar de área de tranbalho"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Mudar de área de trabalho quando o mouse alcançar o canto da tela"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Mudar de área de trabalho quando arrastar uma janela para fora da tela"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Mostrar conteúdo das janelas ao dimensionar"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostrar conteúdo das janelas ao mover"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Ação do duplo clique"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Ação a realizar quando dar um clique duplo na barra de títulos :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Aututomaticamente dê foco \n"
+"em novas janelas criadas"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automaticamente aumente a janela \n"
+"quando elas receberem foco"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Aumentar a janela ao clicar dentro \n"
+"da janela da aplicação"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximizar janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximizar janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Área de trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Teclas de atalho"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Teclas de atalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Teclas de atalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operação não permitida (ainda)\n"
@@ -499,114 +796,6 @@ msgstr "Mudar para ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar janela"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar janela"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Foco em novas janelas"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Foco em novas janelas"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Foco em novas janelas"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Esconder janela"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Mudar de área de tranbalho"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Mudar de área de tranbalho"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Mudar de área de tranbalho"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Mudar de área de tranbalho"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Área de trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Área de trabalho %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Estilo de decoração"
 
diff --git a/po/pt_PT.gmo b/po/pt_PT.gmo
index 936ea638b458a485dec09aee70aba112633ba72b..0e9fea446f2a3215bca5db41983ed927264357b3 100644
Binary files a/po/pt_PT.gmo and b/po/pt_PT.gmo differ
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 5ac735ac5acd87c06d6bc99d2e88b1bd4be632f7..b9775184e8e64ba0ee1ce4ab07cf01da31be1234 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-09-12 22:02+0100\n"
 "Last-Translator: Nuno Donato <nunodonato@sapo.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -86,55 +86,58 @@ msgstr "Mudança de Areas de Trabalho"
 msgid "Workspace names"
 msgstr "Margens da Area de Trabalho"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menu"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Omnipresente"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Enrolar"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Esconder"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Fechar"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Enrolar a janela"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Esconder a janela"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximizar a janela"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Nada"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Esquerda"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Centro"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Direita"
 
@@ -142,208 +145,502 @@ msgstr "Direita"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Escondido"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Dialog de Selecção de Tipos de Letra"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Gestor de Janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Preferências do Gestor de Janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Tipo de letra do título"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Alinhamento do título"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Alinhamento do texto dentro da barra de título"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Disposição dos botões"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Título"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Foco de novas janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Atalhos do Teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Atalhos do Teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Atalhos do Teclado"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Modelo de Foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Clicar para obter foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Foco segue o rato"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Foco de novas janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Dar foco automáticamente\n"
 "a novas janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Subir com o foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Subir automáticamente novas\n"
 "janelas quando recebem o foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Atraso antes de subir janela focada"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Lento"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Rápido"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Subir com o clique"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Subir janela quando se clica dentro\n"
 "da janela da aplicação"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Modelo de Foco"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Atracção de Janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Atrair janelas para a borda do ecrã"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Atrair janelas para outras janelas"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Distância :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Estreita"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Larga"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Mudança de Areas de Trabalho"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Mudar de Area de Trabalho quando o rato alcança a borda do ecrã"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 "Mudar de Area de Trabalho quando se arrasta uma janela para fora do ecrã"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Resistência da borda :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Mover e redimensionar opaco"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Mostrar o conteúdo das janelas enquanto são redimensionadas"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Mostrar o conteúdo das janelas enquanto são movidas"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Acção do Duplo Clique"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Acção a exectuar quando se faz um duplo clique na barra de título"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Dar foco automáticamente\n"
+"a novas janelas"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Subir automáticamente novas\n"
+"janelas quando recebem o foco"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Subir janela quando se clica dentro\n"
+"da janela da aplicação"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximizar a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximizar a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Esconder a janela"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Mudança de Areas de Trabalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Mudança de Areas de Trabalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Mudança de Areas de Trabalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Mudança de Areas de Trabalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Area de Trabalho %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Mudança de Areas de Trabalho"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Foco de novas janelas"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Atalhos do Teclado"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Atalhos do Teclado"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Atalhos do Teclado"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operação (ainda) não suportada\n"
@@ -505,114 +802,6 @@ msgstr "Mudar para..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar a janela"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar a janela"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Foco de novas janelas"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Foco de novas janelas"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Foco de novas janelas"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Esconder a janela"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Mudança de Areas de Trabalho"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Mudança de Areas de Trabalho"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Mudança de Areas de Trabalho"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Mudança de Areas de Trabalho"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Area de Trabalho %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Area de Trabalho %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Estilo da decoração"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 1e7364a059490aa0c36a5eabc1f41e1036ce17ae..b1016bcfff61ac7aea51df9c856ce77f145dc193 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 27290c5e9bdd7112a465c5cff68da447b20f9dfd..08fdcfcdd7e72fe99618aa564a5b2a4c344473c8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-09-03 22:20+0300\n"
 "Last-Translator: Dan Korostelev <daniel@ats.energo.ru>\n"
 "Language-Team: Russian <daniel@ats.energo.ru>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -83,55 +83,58 @@ msgstr "Переключение рабочих мест"
 msgid "Workspace names"
 msgstr "Поля рабочего места"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Меню"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Приклеить"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Свернуть в заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Развернуть"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Закрыть"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Свернуть окно в заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Скрыть окно"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Развернуть окно"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Ничего"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Слева"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "По центру"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Справа"
 
@@ -139,201 +142,489 @@ msgstr "Справа"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Скрыта"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Выбор шрифта"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Менеджер окон"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Настройки менеджера окон"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Шрифт заголовка"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Выравнивание текста заголовка"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Выравнивание текста заголовка :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Расположение кнопок"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Фокус новых окон"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Горячие клавиши"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Горячие клавиши"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Горячие клавиши"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Фокус окна"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Активизация при щелчке мышью"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Активизация при наведении курсора"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Фокус новых окон"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr "Автоматически активизировать вновь созданные окна"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Показ окна при наведении курсора"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr "Автоматически поднимать окно при активизации"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Задержка перед поднятием активизированного окна:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Большая"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Маленькая"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Показ окна при щелчке мышью"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr "Поднимать окно при щелчке на нем"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Фокус окна"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Прилипание окон"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Прилипание окон к краям экрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Прилипание окон к другим окнам"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Расстояние:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Маленькое"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Большое"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Переключение рабочих мест"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Переключать рабочее место при достижении курсором края экрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Переключать рабочее место при перемещении окна за экран"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Расстояние от края:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Перемещение и изменение размера окна"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Показывать содержимое окна при изменении размера"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Показывать содержимое окна при перемещении"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Двойной щелчок на заголовке"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Действие по двойному щелчку в области заголовка :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr "Автоматически активизировать вновь созданные окна"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr "Автоматически поднимать окно при активизации"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr "Поднимать окно при щелчке на нем"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Развернуть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Развернуть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Скрыть окно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Переключение рабочих мест"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Переключение рабочих мест"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Переключение рабочих мест"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Переключение рабочих мест"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Рабочее место %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Переключение рабочих мест"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Фокус новых окон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Горячие клавиши"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Горячие клавиши"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Горячие клавиши"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Операция не поддерживается (пока)\n"
@@ -496,114 +787,6 @@ msgstr "Переключиться на ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Развернуть окно"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Развернуть окно"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Фокус новых окон"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Фокус новых окон"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Фокус новых окон"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Скрыть окно"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Переключение рабочих мест"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Переключение рабочих мест"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Переключение рабочих мест"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Переключение рабочих мест"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Рабочее место %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Рабочее место %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Стиль оформления"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 5cf36bbfaf8043a87db60ae8242ff98dcfb123d7..ca11c488c500b84e985f01bf8af5330c818c1375 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 4fd9c994b9938996d66f4afb054aaf16795e364f..f320d8f7189b21bd40030f1c4debd486b690a774 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -86,55 +86,58 @@ msgstr "Byt arbetsyta"
 msgid "Workspace names"
 msgstr "Skrivbordsmarginaler"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Meny"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Klistrig"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Rulla upp"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Göm"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Maximera"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Stäng"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Rulla upp fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Göm fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Maximera fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Vänster"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Mitten"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Höger"
 
@@ -142,207 +145,501 @@ msgstr "Höger"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Titel"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Gömd"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Typsnittsvalsdialog"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Fönsterhanterare"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Fönsterhanterarinställningar"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Titeltypsnitt"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Titeljustering"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Textjustering inom titelraden:"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Knapplayout"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Titel"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Nytt fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Snabbtangent"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Snabbtangent"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Snabbtangent"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Fokusmodell"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Klicka för att fokusera"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Fokus följer musen"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Nytt fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Ge fokus till nya fönster\n"
 "automatiskt"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Höj vid vokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Höj fönster automatiskt \n"
 "när de får fokus"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Fördröjning innan fokuserat fönster höjs:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "LÃ¥ngsamt"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Snabbt"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Höj vid klick"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Höj fönsteret vid klick inom \n"
 "applikationsfönstret"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Fokusmodell"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Fönsterattraktion"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Fönster attraheras till skärmkant"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Fönster attraheras till andra fönster"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Avstånd:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Litet"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Brett"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Byt arbetsyta"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Byt arbetsyta när muspekaren når skärmens kant"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Byt arbetsyta när fönster dras från skärmen"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Kantmotstånd:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Ogenomskinlig flyttning och storleksändring"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Visa fönsterinnehåll vid flyttning"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Visa fönsterinnehåll vid flyttning"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Dubbelklicksåtgärd"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Åtgärd vid dubbelklick på titelraden:"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Ge fokus till nya fönster\n"
+"automatiskt"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Höj fönster automatiskt \n"
+"när de får fokus"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Höj fönsteret vid klick inom \n"
+"applikationsfönstret"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximera fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximera fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Göm fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Byt arbetsyta"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Byt arbetsyta"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Byt arbetsyta"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Byt arbetsyta"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Arbetsyta %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Byt arbetsyta"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Nytt fönster"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Snabbtangent"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Snabbtangent"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Snabbtangent"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Åtgärd ej understödd (ännu)\n"
@@ -504,114 +801,6 @@ msgstr "Byt till.."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximera fönster"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximera fönster"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Nytt fönster"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Nytt fönster"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Nytt fönster"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Göm fönster"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Byt arbetsyta"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Byt arbetsyta"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Byt arbetsyta"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Byt arbetsyta"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Arbetsyta %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Arbetsyta %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Dekorationsstil"
 
diff --git a/po/ta.gmo b/po/ta.gmo
index 583e49e7a11d0af177bbd7f6e023897a34ac88a4..8d4c2cd8db4be9057ae935cf04ca43692aaef007 100644
Binary files a/po/ta.gmo and b/po/ta.gmo differ
diff --git a/po/ta.po b/po/ta.po
index 0dee8c863b5aef90788426c99f5dbeb2c8d986dc..99011f4316ca88b631a8734039a48ba168c9c01e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tamil XFWM4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-09-24 18:05-0500\n"
 "Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -83,55 +83,58 @@ msgstr "வேலை þடங்கள் மடிப்பு"
 msgid "Workspace names"
 msgstr "வேலையிட எல்லைகள்"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "பட்டி"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "ஒட்டு"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "நிழல் தரம்"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "மறை"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "பெருதாக்கு"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "மூடு"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "வண்ண-சாளரம்"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "சாளரம் மறை"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "சாளரம் பெருதாக்கு"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "ஏதும் þல்லை"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "இடது"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "நடுவில்"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "வலது"
 
@@ -139,207 +142,501 @@ msgstr "வலது"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "தலைப்பு"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "மறைந்தது"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "ஏழுத்துரு தேர்ந்தெடுக்கும் உரையாடல்"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "சாளரமேலாளர்"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "சாளரமேலாளர் விருப்பங்கள்"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "தலைப்பு எழுத்துரு"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "தலைப்பு þடம் அமைப்பு"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "சாளரத்தின் தலைப்புப் பட்டையில் அரை பொருத்தம் :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "பொத்தான் அமைப்பு"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "தலைப்பு"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "சாளரம் பாணி"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "விசைப்பலகை குறுக்கு வழி"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "விசைப்பலகை குறுக்கு வழி"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "விசைப்பலகை குறுக்கு வழி"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "சாளரம் பெறும் முறைமை"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "அமுக்கவேண்டும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "சுட்டி þருக்குமிடத்தில்"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "புதிய சாளரத்திற்கு"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "புதிதாக படைக்கப்பட்ட சாளரங்களுக்கு \n"
 "தானாக சுட்டி கைப்பிடி கொடுக்கவும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "கைப்பிடிப்பு/உயர்த்தல்"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "சாளரங்களுக்கு கைப்பிடி கிடைக்கும்போது \n"
 "அவைகளை தானாக மேல் உயர்த்தவும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "சாளரத்தை உயர்த்தும் தாமதம் :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "மெதுவாக"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "வேகமாக"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "அமுத்தும் போது உயர்த்து"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "நிரல் சாளரத்திற்குள் அமுத்தும்போது\n"
 "சாளரத்தை உயர்த்து"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "சாளரம் பெறும் முறைமை"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "சாளரங்கள் போடுதல்"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "சாளரங்களை திறை எல்லையுடன் போடுக"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "சாளரங்களை மற்ற சாளரங்களுடன் போடுக"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "தூரம் :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "அருகில்"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "அகலம்"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "வேலை þடங்கள் மடிப்பு"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "சுட்டி அம்பு திரை எல்லையை அடைந்தவுடன் வேலைஃþடத்தைஃமடிக்கவும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "ஓர் சாளரத்தை திரை எல்லைக்கு வெளியே þழுக்கும் போது வேலை þடத்தை மடி"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "விளிம்பு மறிப்பு :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "ஒளி பாயாத அளவு மாற்றமும் நகர்த்துதலும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "þரட்டை அமுத்தல் செயல்"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "தலைப்புப் பட்டையில் þரட்டை அமுத்தல் செயல் :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "உயர்நிலை"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"புதிதாக படைக்கப்பட்ட சாளரங்களுக்கு \n"
+"தானாக சுட்டி கைப்பிடி கொடுக்கவும்"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"சாளரங்களுக்கு கைப்பிடி கிடைக்கும்போது \n"
+"அவைகளை தானாக மேல் உயர்த்தவும்"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"நிரல் சாளரத்திற்குள் அமுத்தும்போது\n"
+"சாளரத்தை உயர்த்து"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "சாளரம் பெருதாக்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "சாளரம் பெருதாக்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "சாளரம் மறை"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "வேலை þடம் %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "புதிய சாளரத்திற்கு"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "விசைப்பலகை குறுக்கு வழி"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "விசைப்பலகை குறுக்கு வழி"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "விசைப்பலகை குறுக்கு வழி"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: இயக்கத்திட்கு ஆதரவளிப்பு þல்லை (þப்பொழுது)\n"
@@ -501,114 +798,6 @@ msgstr "þதட்கு மாற்றவும் ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "சாளரம் பெருதாக்கு"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "சாளரம் பெருதாக்கு"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "புதிய சாளரத்திற்கு"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "புதிய சாளரத்திற்கு"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "புதிய சாளரத்திற்கு"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "சாளரம் மறை"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "வேலை þடங்கள் மடிப்பு"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "வேலை þடங்கள் மடிப்பு"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "வேலை þடங்கள் மடிப்பு"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "வேலை þடங்கள் மடிப்பு"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "வேலை þடம் %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "வேலை þடம் %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "அலங்காரம் பாணி"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 02d3dec972635b12119e8e9a39168d39ef29be59..a63555861475608645df9548349b4ce844c6a140 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 42c21e68540aead132f771b7bc5ce367645edd2f..ca89515800da7e7f4dd7ec07fd0424a53658d94a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-12-13 22:56+0200\n"
 "Last-Translator: Erçin EKER <erc.caldera@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -84,55 +84,58 @@ msgstr "Çalışma alanlarını değiştir"
 msgid "Workspace names"
 msgstr "Çalışma Alanı Sınırları"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Menü"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Sabitle"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Gölgele"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Sakla"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Büyüt"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Kapat"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Pencereyi gölgele"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Pencereyi sakla"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Pencereyi büyüt"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Hiçbir şey"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Sol"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Merkez"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "SaÄŸ"
 
@@ -140,207 +143,501 @@ msgstr "SaÄŸ"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Başlık"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Gizli"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Yazıtipi Seçim Diyaloğu"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Pencere Yöneticisi"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Pencere Yöneticisi Tercihleri"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Başlık yazıtipi"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Başlık Hizalaması"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Başlık çubuğundaki metin hizalaması :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Düğme düzeni"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Başlık"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Yeni pencere odaklaması"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Klavye Kısayolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Klavye Kısayolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Klavye Kısayolu"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Odaklama ÅŸekli"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Odaklama için tıklansın"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Odak fareyi takip etsin"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Yeni pencere odaklaması"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Yeni oluÅŸturulan pencereye \n"
 "otomatik olarak odaklan"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Odaklamada yükselt"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Pencereler odaklanma kazanınca \n"
 "otomatik olarak yükselt"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Odaklanmış pencere yükselme gecikmesi :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "YavaÅŸ"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Hızlı"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Tıklamada yükselt"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Uygulama penceresinin içine tıklayınca\n"
 "pencereyi yükselt"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Odaklama ÅŸekli"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Pencere yerleÅŸtirme"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Pencereleri ekran sınırlarına daya"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Pencereleri diÄŸerlerine daya"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Uzaklık :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Küçük"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Büyük"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Çalışma alanlarını değiştir"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "İşaretçi ekran kenarına geldiğinde çalışma alanını değiştir"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Bir pencereyi ekran dışına taşıyınca çalışma alanını değiştir"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Kenar direnci :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Mat taşıma ve boyutlandırma"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Pencereleri yeniden boyutlandırıken içeriğini göster"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Pencereleri taşırken içeriğini göster"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Çift tıklama eylemi"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Başlık çubuğuna çift tıklandığında uygulanacak eylem :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Yeni oluÅŸturulan pencereye \n"
+"otomatik olarak odaklan"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Pencereler odaklanma kazanınca \n"
+"otomatik olarak yükselt"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Uygulama penceresinin içine tıklayınca\n"
+"pencereyi yükselt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Pencereyi büyüt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Pencereyi büyüt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Pencereyi sakla"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Çalışma alanlarını değiştir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Çalışma alanlarını değiştir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Çalışma alanlarını değiştir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Çalışma alanlarını değiştir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Çalışma alanlarını değiştir"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Yeni pencere odaklaması"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Klavye Kısayolu"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Klavye Kısayolu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Klavye Kısayolu"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: İşlem desteklenmiyor (henüz)\n"
@@ -503,114 +800,6 @@ msgstr "Geç ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Pencereyi büyüt"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Pencereyi büyüt"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Yeni pencere odaklaması"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Yeni pencere odaklaması"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Yeni pencere odaklaması"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Pencereyi sakla"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Çalışma alanlarını değiştir"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Çalışma alanlarını değiştir"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Çalışma alanlarını değiştir"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Çalışma alanlarını değiştir"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Çalışma alanı %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Çalışma alanı %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Dekorasyon stili"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 99080d7b85aef09222a16e3b0aab01e4456d66ce..9536ac1bca53377fa3bdfe1f524f6574eaf95fef 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 2e601c4fa6386543cdc571dfff2f2d4bc84c6aa5..c92eba5b1a689934cde0597c48f182dc83f1f951 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-10-26 15:12+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -84,55 +84,58 @@ msgstr "Загортання робочих областей"
 msgid "Workspace names"
 msgstr "Поля стільниці"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Меню"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Приліплення"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Затінення"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Приховування"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Максимізація"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Закривання"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Затінити вікно"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Приховати вікно"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Максимізувати вікно"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Нічого не робити"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Зліва"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "По центру"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Справа"
 
@@ -140,208 +143,502 @@ msgstr "Справа"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Прихована"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Вибір шрифту"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Менеджер вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Властивості менеджера вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Шрифт заголовка"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Вирівнювання заголовку"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Вирівнювання тексту всередині заголовка:"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Розташування кнопок"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Заголовок"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Фокусування нових вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Комбінації клавіш"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Комбінації клавіш"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Комбінації клавіш"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Модель передачі фокусу"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "При клацанні"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Фокус слідкує за мишею"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Фокусування нових вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Автоматично передавати фокус \n"
 "створюваним новим вікнам"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Піднімання при передачі фокусу"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Автоматично піднімати вікно при \n"
 "отриманні ним фокусу"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Затримка перед підніманням вікна з фокусом:"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Повільно"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Швидко"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Піднімання при клацанні"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Піднімати вікно при клацанні у середині \n"
 "вікна програми"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Модель передачі фокусу"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Припасування вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Припасовувати вікна до меж екрана"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Припасовувати вікна до інших вікон"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Відстань:"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Маленька"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Велика"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Загортання робочих областей"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Переходити на іншу робочу область при досягненні межі екрану"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 "Переходити на іншу робочу область при перетягуванні вікна за межі екрану"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Область нечутливості до переносу:"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Непрозоре переміщення та зміна розмірів "
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Відображати вміст вікон при зміні розміру"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Відображати вміст вікон при переміщенні"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Дія при подвійному клацанні"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Дія, що виконується при подвійному клацанні на заголовку:"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Автоматично передавати фокус \n"
+"створюваним новим вікнам"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Автоматично піднімати вікно при \n"
+"отриманні ним фокусу"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Піднімати вікно при клацанні у середині \n"
+"вікна програми"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Максимізувати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Максимізувати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Приховати вікно"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Загортання робочих областей"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Загортання робочих областей"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Загортання робочих областей"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Загортання робочих областей"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Робочу область %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Загортання робочих областей"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Фокусування нових вікон"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Комбінації клавіш"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Комбінації клавіш"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Комбінації клавіш"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Операція не підтримується (поки-що)\n"
@@ -503,114 +800,6 @@ msgstr "Перемикнутись на ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Максимізувати вікно"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Максимізувати вікно"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Фокусування нових вікон"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Фокусування нових вікон"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Фокусування нових вікон"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Приховати вікно"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Загортання робочих областей"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Загортання робочих областей"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Загортання робочих областей"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Загортання робочих областей"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Робочу область %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Робочу область %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Стиль оздоблення"
 
diff --git a/po/vi.gmo b/po/vi.gmo
index 12034847f212207a1584d1e71432a4c66a6d6c39..46e1d0f3c11cce6882e2e5047333ddf032220d8b 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index c89329ebd9d0871976af422e6dba3c53f7e76899..778c0745b2f7607fe44085f1d3176f0278e54e2a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2003-10-24 23:55+9\n"
 "Last-Translator: Lâm Vĩnh Niên <nienvl@yahoo.ca>\n"
 "Language-Team: none <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -83,55 +83,58 @@ msgstr "Chuyển không gian làm việc"
 msgid "Workspace names"
 msgstr "Lề không gian làm việc"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "Trình đơn"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "Dính"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "Che"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "Ẩn"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "Phóng to"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "Đóng"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "Che cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "Ẩn cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "Phóng to cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "Không"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "Trái"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "Giữa"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "Phải"
 
@@ -139,207 +142,501 @@ msgstr "Phải"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "Tiêu đề"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "Ẩn"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "Hộp thoại chọn phông"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "Trình quản lí cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "Tuỳ chọn Trình quản lí cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "Phông tiêu đề"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "Canh tiêu đề"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "Canh văn bảo bên trong thanh tiêu đề :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "Trình bày nút"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "Tiêu đề"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "Chọn cửa sổ mới"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "Phím tắt"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "Phím tắt"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "Phím tắt"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "Kiểu chọn cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "Bấm chuột để chọn"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "Chọn theo vị trí chuột"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "Chọn cửa sổ mới"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "Tự động chọn cửa sổ cho \n"
 "các cửa sổ mới được tạo"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "Hiển thị khi chọn"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "Tự động hiển thị cửa sổ \n"
 "khi chúng được chọn"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "Thời gian trễ trước khi hiển thị cửa sổ được chọn :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "Chậm"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "Nhanh"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "Hiển thị khi bấm chuột"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "Hiển thị cửa sổ khi ấn bên trong\n"
 "cửa sổ ứng dụng"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "Kiểu chọn cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "Điều chỉnh bờ cửa sổ"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "Bờ cửa sổ theo bờ màn hình"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "Bờ cửa sổ theo các cửa sổ khác"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "Khoảng cách :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "Nhỏ"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "Rá»™ng"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "Chuyển không gian làm việc"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "Chuyển không gian làm việc khi con trỏ chuột đến bờ màn hình"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "Chuyển không gian làm việc khi kéo cửa sổ ra khỏi màn hình"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "Sức đề kháng bờ"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "Di chuyển và thay đổi kích thước mờ"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "Hiển thị nội dung cửa sổ khi thay đổi kích thước"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "Hiển thị nội dung cửa sổ khi di chuyển"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "Hành động khi bấm kép chuột"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "Hành động khi bấm kép trên thanh tiêu đề :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "Cao cấp"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Tự động chọn cửa sổ cho \n"
+"các cửa sổ mới được tạo"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Tự động hiển thị cửa sổ \n"
+"khi chúng được chọn"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"Hiển thị cửa sổ khi ấn bên trong\n"
+"cửa sổ ứng dụng"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Phóng to cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Phóng to cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "Ẩn cửa sổ"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "Chuyển không gian làm việc"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "Chuyển không gian làm việc"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "Chuyển không gian làm việc"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "Chuyển không gian làm việc"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "Không gian làm việc %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "Chuyển không gian làm việc"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "Chọn cửa sổ mới"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "Phím tắt"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "Phím tắt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "Phím tắt"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Hoạt động không (chưa) được hỗ trợ\n"
@@ -501,114 +798,6 @@ msgstr "Chuyển sang ..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "Phóng to cửa sổ"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Phóng to cửa sổ"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "Chọn cửa sổ mới"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "Chọn cửa sổ mới"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "Chọn cửa sổ mới"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "Ẩn cửa sổ"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "Chuyển không gian làm việc"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "Chuyển không gian làm việc"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "Chuyển không gian làm việc"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "Chuyển không gian làm việc"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "Không gian làm việc %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "Không gian làm việc %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "Kiểu trang trí"
 
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index f52d8fb1d0f789b5c5eee120ee7ed8f20ea0c45d..24d34120c52a558764583e792ca27546316f3fbc 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -7,8 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -80,55 +79,58 @@ msgstr ""
 msgid "Workspace names"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr ""
 
@@ -136,192 +138,435 @@ msgstr ""
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr ""
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 msgid "Style"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 msgid "Windows shortcuts"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 msgid "Shortcut"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 msgid "Command shortcuts"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 msgid "Keyboard"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 msgid "Raise window when clicking inside application window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 msgid "Focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr ""
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+msgid "Close window"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+msgid "Maximize window vertically"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+msgid "Maximize window horizontally"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+msgid "Stick window"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+msgid "Cycle windows"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+msgid "Move window up"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+msgid "Move window down"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+msgid "Move window left"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+msgid "Move window right"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+msgid "Resize window up"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+msgid "Resize window down"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+msgid "Resize window left"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+msgid "Resize window right"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+msgid "Raise window"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+msgid "Lower window"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+msgid "Next workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+msgid "Previous workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+msgid "Add workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+msgid "Delete workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+msgid "Workspace 1"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+msgid "Workspace 2"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+msgid "Workspace 3"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+msgid "Workspace 4"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+msgid "Workspace 5"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+msgid "Workspace 6"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+msgid "Workspace 7"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+msgid "Workspace 8"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+msgid "Workspace 9"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+msgid "Move window to next workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+msgid "Move window to previous workspace"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+msgid "Move window to workspace 1"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+msgid "Move window to workspace 2"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+msgid "Move window to workspace 3"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+msgid "Move window to workspace 4"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+msgid "Move window to workspace 5"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+msgid "Move window to workspace 6"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+msgid "Move window to workspace 7"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+msgid "Move window to workspace 8"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+msgid "Move window to workspace 9"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+msgid "Compose shortcut for :"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+msgid "Compose shortcut"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+msgid "Command :"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index f521b09b217d24a04d90e2c37e4f8809f734fea6..3ece37f2b44e2ad031cf0766c20d770614cda21c 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index aff023db1fa467bc7034dca061482e5b297effe9..f82cd5cb0fe7fc6c7bcb15f1d2e9366d7694eaeb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-06-11 16:52+0200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
 "Language-Team: none <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -79,55 +79,58 @@ msgstr "工作区名称: "
 msgid "Workspace names"
 msgstr "工作区个数"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "菜单"
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "粘连"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "卷起"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "隐藏"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "最大化"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "关闭"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "卷起窗口"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "隐藏窗口"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "最大化窗口"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "æ— "
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "左侧"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "中间"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "右侧"
 
@@ -135,207 +138,502 @@ msgstr "右侧"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "标题"
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "隐藏"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "字体选择对话框"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "窗口管理器"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "窗口管理器首选项"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "标题字体"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "标题对齐方式"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "标题拦内的文本对齐方式 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "按钮布局"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "标题"
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "窗口风格"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "快捷键"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "快捷键"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "焦点模式"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "点击获取焦点"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "焦点跟随鼠标"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "新窗口获取焦点"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "自动为新建立\n"
 "窗口获取焦点"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "获得焦点时置顶"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "当窗口获得焦点时\n"
 "自动将该窗口置顶"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "置顶焦点所在窗口前的延时 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "æ…¢"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "å¿«"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "点击置顶"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "当在窗口客户区\n"
 "点击时将其置顶"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "焦点模式"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "窗口吸引"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "在屏幕边缘吸引窗口"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "将窗口吸引到其它窗口"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "距离 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "小"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "宽"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "回绕工作区"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "鼠标到达屏幕边缘时回绕工作区"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "拖拽窗口离开屏幕时回绕工作区"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "屏幕边缘阻力 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "移动及缩放时显示窗口内容"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "改变窗口尺寸时显示其内容"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "移动窗口时显示其内容"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "双击执行动作"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "双击标题栏所执行的动作 :"
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "高级"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"自动为新建立\n"
+"窗口获取焦点"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"当窗口获得焦点时\n"
+"自动将该窗口置顶"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"当在窗口客户区\n"
+"点击时将其置顶"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "最大化窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "最大化窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "隐藏窗口"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+#, fuzzy
+msgid "Toggle fullscreen"
+msgstr "无法获取默认屏幕"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "回绕工作区"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "回绕工作区"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "回绕工作区"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "回绕工作区"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "工作区 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "回绕工作区"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "新窗口获取焦点"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "快捷键"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "快捷键"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "快捷键"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: 尚不支持的操作\n"
@@ -497,118 +795,6 @@ msgstr "切换到 ..."
 msgid "Unknown application!"
 msgstr "未知的应用程序！"
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "最大化窗口"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "最大化窗口"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "新窗口获取焦点"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "新窗口获取焦点"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "新窗口获取焦点"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "隐藏窗口"
-
-#, fuzzy
-#~ msgid "Toggle fullscreen"
-#~ msgstr "无法获取默认屏幕"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "回绕工作区"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "回绕工作区"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "回绕工作区"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "回绕工作区"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "工作区 %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "工作区 %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "装饰风格"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 4612d06e7ec21e2ed287b12c32ee6ac2bda6db88..3fac101edabeb208e450c3423e7495eb6c6f0a27 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0e7cdddd08c398595a3629cafd17a973ffd8f040..5a3cf4389586657fde762fd773091ae80f933854 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-04 18:47+0200\n"
+"POT-Creation-Date: 2004-08-07 22:33+0200\n"
 "PO-Revision-Date: 2004-04-20 16:38+0800\n"
 "Last-Translator: umm <umm@pchome.com.tw>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: mcs-plugin/margins.c:122
 msgid "Workspace Margins"
@@ -81,55 +81,58 @@ msgstr "工作區名稱："
 msgid "Workspace names"
 msgstr "工作區個數"
 
-#: mcs-plugin/xfwm4_plugin.c:81
+#: mcs-plugin/xfwm4_plugin.c:81 mcs-plugin/xfwm4_plugin_orig.c:99
 msgid "Menu"
 msgstr "選單："
 
-#: mcs-plugin/xfwm4_plugin.c:82
+#: mcs-plugin/xfwm4_plugin.c:82 mcs-plugin/xfwm4_plugin_orig.c:100
 msgid "Stick"
 msgstr "貼連"
 
-#: mcs-plugin/xfwm4_plugin.c:83
+#: mcs-plugin/xfwm4_plugin.c:83 mcs-plugin/xfwm4_plugin_orig.c:101
 msgid "Shade"
 msgstr "捲起"
 
-#: mcs-plugin/xfwm4_plugin.c:84
+#: mcs-plugin/xfwm4_plugin.c:84 mcs-plugin/xfwm4_plugin_orig.c:102
 msgid "Hide"
 msgstr "隱藏"
 
-#: mcs-plugin/xfwm4_plugin.c:85
+#: mcs-plugin/xfwm4_plugin.c:85 mcs-plugin/xfwm4_plugin_orig.c:103
 msgid "Maximize"
 msgstr "最大化"
 
-#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_plugin_orig.c:104
 msgid "Close"
 msgstr "關閉"
 
-#: mcs-plugin/xfwm4_plugin.c:91
+#: mcs-plugin/xfwm4_plugin.c:91 mcs-plugin/xfwm4_plugin_orig.c:108
+#: mcs-plugin/xfwm4_shortcuteditor.c:89 mcs-plugin/xfwm4_shortcuteditor.c:459
 msgid "Shade window"
 msgstr "捲起視窗"
 
-#: mcs-plugin/xfwm4_plugin.c:92
+#: mcs-plugin/xfwm4_plugin.c:92 mcs-plugin/xfwm4_plugin_orig.c:109
+#: mcs-plugin/xfwm4_shortcuteditor.c:84 mcs-plugin/xfwm4_shortcuteditor.c:455
 msgid "Hide window"
 msgstr "隱藏視窗"
 
-#: mcs-plugin/xfwm4_plugin.c:93
+#: mcs-plugin/xfwm4_plugin.c:93 mcs-plugin/xfwm4_plugin_orig.c:110
+#: mcs-plugin/xfwm4_shortcuteditor.c:69 mcs-plugin/xfwm4_shortcuteditor.c:443
 msgid "Maximize window"
 msgstr "最大化視窗"
 
-#: mcs-plugin/xfwm4_plugin.c:94
+#: mcs-plugin/xfwm4_plugin.c:94 mcs-plugin/xfwm4_plugin_orig.c:111
 msgid "Nothing"
 msgstr "ç„¡"
 
-#: mcs-plugin/xfwm4_plugin.c:99
+#: mcs-plugin/xfwm4_plugin.c:99 mcs-plugin/xfwm4_plugin_orig.c:116
 msgid "Left"
 msgstr "左側"
 
-#: mcs-plugin/xfwm4_plugin.c:100
+#: mcs-plugin/xfwm4_plugin.c:100 mcs-plugin/xfwm4_plugin_orig.c:117
 msgid "Center"
 msgstr "中間"
 
-#: mcs-plugin/xfwm4_plugin.c:101
+#: mcs-plugin/xfwm4_plugin.c:101 mcs-plugin/xfwm4_plugin_orig.c:118
 msgid "Right"
 msgstr "右側"
 
@@ -137,207 +140,501 @@ msgstr "右側"
 msgid "Click and drag buttons to change the layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:573
+#: mcs-plugin/xfwm4_plugin.c:574
 msgid "Active"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:584
+#: mcs-plugin/xfwm4_plugin.c:585 mcs-plugin/xfwm4_plugin_orig.c:98
 msgid "Title"
 msgstr "標題："
 
-#: mcs-plugin/xfwm4_plugin.c:585
+#: mcs-plugin/xfwm4_plugin.c:586
 msgid "The window title, it cannot be removed"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:593
+#: mcs-plugin/xfwm4_plugin.c:594 mcs-plugin/xfwm4_plugin_orig.c:327
 msgid "Hidden"
 msgstr "隱藏"
 
-#: mcs-plugin/xfwm4_plugin.c:1298
+#: mcs-plugin/xfwm4_plugin.c:1299 mcs-plugin/xfwm4_plugin_orig.c:1011
 msgid "Font Selection Dialog"
 msgstr "字型選擇對話框"
 
-#: mcs-plugin/xfwm4_plugin.c:1393 mcs-plugin/xfwm4_plugin.c:1880
+#: mcs-plugin/xfwm4_plugin.c:1394 mcs-plugin/xfwm4_plugin.c:1881
+#: mcs-plugin/xfwm4_plugin_orig.c:1107 mcs-plugin/xfwm4_plugin_orig.c:1610
 msgid "Window Manager"
 msgstr "視窗管理程式"
 
-#: mcs-plugin/xfwm4_plugin.c:1406
+#: mcs-plugin/xfwm4_plugin.c:1407 mcs-plugin/xfwm4_plugin_orig.c:1120
 msgid "Window Manager Preferences"
 msgstr "視窗管理程式選項"
 
-#: mcs-plugin/xfwm4_plugin.c:1435
+#: mcs-plugin/xfwm4_plugin.c:1436 mcs-plugin/xfwm4_plugin_orig.c:1150
 msgid "Title font"
 msgstr "標題字型"
 
-#: mcs-plugin/xfwm4_plugin.c:1448
+#: mcs-plugin/xfwm4_plugin.c:1449 mcs-plugin/xfwm4_plugin_orig.c:1163
 msgid "Title Alignment"
 msgstr "標題對齊方式"
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:1454
+#: mcs-plugin/xfwm4_plugin.c:1455 mcs-plugin/xfwm4_plugin_orig.c:1169
 msgid "Text alignment inside title bar :"
 msgstr "標題欄內的本文對齊方式："
 
-#: mcs-plugin/xfwm4_plugin.c:1456
+#: mcs-plugin/xfwm4_plugin.c:1457 mcs-plugin/xfwm4_plugin_orig.c:1171
 msgid "Button layout"
 msgstr "按鈕布局"
 
-#: mcs-plugin/xfwm4_plugin.c:1462
+#: mcs-plugin/xfwm4_plugin.c:1463 mcs-plugin/xfwm4_plugin_orig.c:1177
 #, fuzzy
 msgid "Style"
 msgstr "標題："
 
-#: mcs-plugin/xfwm4_plugin.c:1488
+#: mcs-plugin/xfwm4_plugin.c:1489 mcs-plugin/xfwm4_plugin_orig.c:1203
 #, fuzzy
 msgid "Windows shortcuts"
 msgstr "新視窗獲取焦點"
 
-#: mcs-plugin/xfwm4_plugin.c:1509 mcs-plugin/xfwm4_plugin.c:1537
+#: mcs-plugin/xfwm4_plugin.c:1510 mcs-plugin/xfwm4_plugin.c:1538
+#: mcs-plugin/xfwm4_plugin_orig.c:1224 mcs-plugin/xfwm4_plugin_orig.c:1252
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1514 mcs-plugin/xfwm4_plugin.c:1542
+#: mcs-plugin/xfwm4_plugin.c:1515 mcs-plugin/xfwm4_plugin.c:1543
+#: mcs-plugin/xfwm4_plugin_orig.c:1229 mcs-plugin/xfwm4_plugin_orig.c:1257
 #, fuzzy
 msgid "Shortcut"
 msgstr "快速鍵"
 
-#: mcs-plugin/xfwm4_plugin.c:1517
+#: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin_orig.c:1232
 #, fuzzy
 msgid "Command shortcuts"
 msgstr "快速鍵"
 
-#: mcs-plugin/xfwm4_plugin.c:1545
+#: mcs-plugin/xfwm4_plugin.c:1546 mcs-plugin/xfwm4_plugin_orig.c:1260
 #, fuzzy
 msgid "Keyboard"
 msgstr "快速鍵"
 
-#: mcs-plugin/xfwm4_plugin.c:1556
+#: mcs-plugin/xfwm4_plugin.c:1557 mcs-plugin/xfwm4_plugin_orig.c:1271
 msgid "Focus model"
 msgstr "焦點模式"
 
-#: mcs-plugin/xfwm4_plugin.c:1564
+#: mcs-plugin/xfwm4_plugin.c:1565 mcs-plugin/xfwm4_plugin_orig.c:1279
 msgid "Click to focus"
 msgstr "點選獲取焦點"
 
-#: mcs-plugin/xfwm4_plugin.c:1571
+#: mcs-plugin/xfwm4_plugin.c:1572 mcs-plugin/xfwm4_plugin_orig.c:1286
 msgid "Focus follows mouse"
 msgstr "焦點跟隨鼠標"
 
-#: mcs-plugin/xfwm4_plugin.c:1578
+#: mcs-plugin/xfwm4_plugin.c:1579 mcs-plugin/xfwm4_plugin_orig.c:1293
 msgid "New window focus"
 msgstr "新視窗獲取焦點"
 
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1583
 #, fuzzy
 msgid "Automatically give focus to newly created windows"
 msgstr ""
 "自動為新建立\n"
 "視窗獲取焦點"
 
-#: mcs-plugin/xfwm4_plugin.c:1587
+#: mcs-plugin/xfwm4_plugin.c:1588 mcs-plugin/xfwm4_plugin_orig.c:1302
 msgid "Raise on focus"
 msgstr "獲取焦點時置頂"
 
-#: mcs-plugin/xfwm4_plugin.c:1595
+#: mcs-plugin/xfwm4_plugin.c:1596
 #, fuzzy
 msgid "Automatically raise windows when they receive focus"
 msgstr ""
 "當視窗獲取焦點時\n"
 "自動將該視窗置頂"
 
-#: mcs-plugin/xfwm4_plugin.c:1605
+#: mcs-plugin/xfwm4_plugin.c:1606 mcs-plugin/xfwm4_plugin_orig.c:1320
 msgid "Delay before raising focused window :"
 msgstr "置頂焦點所在視窗前的延遲："
 
-#: mcs-plugin/xfwm4_plugin.c:1611
+#: mcs-plugin/xfwm4_plugin.c:1612 mcs-plugin/xfwm4_plugin_orig.c:1326
 msgid "Slow"
 msgstr "æ…¢"
 
-#: mcs-plugin/xfwm4_plugin.c:1617
+#: mcs-plugin/xfwm4_plugin.c:1618 mcs-plugin/xfwm4_plugin_orig.c:1332
 msgid "Fast"
 msgstr "å¿«"
 
-#: mcs-plugin/xfwm4_plugin.c:1633
+#: mcs-plugin/xfwm4_plugin.c:1634 mcs-plugin/xfwm4_plugin_orig.c:1348
 msgid "Raise on click"
 msgstr "點選置頂"
 
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1638
 #, fuzzy
 msgid "Raise window when clicking inside application window"
 msgstr ""
 "點選視窗內部時\n"
 "將視窗置頂"
 
-#: mcs-plugin/xfwm4_plugin.c:1642
+#: mcs-plugin/xfwm4_plugin.c:1643 mcs-plugin/xfwm4_plugin_orig.c:1357
 #, fuzzy
 msgid "Focus"
 msgstr "焦點模式"
 
-#: mcs-plugin/xfwm4_plugin.c:1652
+#: mcs-plugin/xfwm4_plugin.c:1653 mcs-plugin/xfwm4_plugin_orig.c:1367
 msgid "Windows snapping"
 msgstr "視窗吸引"
 
-#: mcs-plugin/xfwm4_plugin.c:1660
+#: mcs-plugin/xfwm4_plugin.c:1661 mcs-plugin/xfwm4_plugin_orig.c:1375
 msgid "Snap windows to screen border"
 msgstr "在螢幕邊緣吸引視窗"
 
-#: mcs-plugin/xfwm4_plugin.c:1665
+#: mcs-plugin/xfwm4_plugin.c:1666 mcs-plugin/xfwm4_plugin_orig.c:1380
 msgid "Snap windows to other windows"
 msgstr "將視窗吸引到其他視窗"
 
-#: mcs-plugin/xfwm4_plugin.c:1675
+#: mcs-plugin/xfwm4_plugin.c:1676 mcs-plugin/xfwm4_plugin_orig.c:1390
 msgid "Distance :"
 msgstr "距離："
 
-#: mcs-plugin/xfwm4_plugin.c:1681 mcs-plugin/xfwm4_plugin.c:1731
+#: mcs-plugin/xfwm4_plugin.c:1682 mcs-plugin/xfwm4_plugin.c:1732
+#: mcs-plugin/xfwm4_plugin_orig.c:1396 mcs-plugin/xfwm4_plugin_orig.c:1446
 msgid "Small"
 msgstr "窄"
 
-#: mcs-plugin/xfwm4_plugin.c:1687 mcs-plugin/xfwm4_plugin.c:1737
+#: mcs-plugin/xfwm4_plugin.c:1688 mcs-plugin/xfwm4_plugin.c:1738
+#: mcs-plugin/xfwm4_plugin_orig.c:1402 mcs-plugin/xfwm4_plugin_orig.c:1452
 msgid "Wide"
 msgstr "寬"
 
-#: mcs-plugin/xfwm4_plugin.c:1702
+#: mcs-plugin/xfwm4_plugin.c:1703 mcs-plugin/xfwm4_plugin_orig.c:1417
 msgid "Wrap workspaces"
 msgstr "迴繞工作區"
 
-#: mcs-plugin/xfwm4_plugin.c:1710
+#: mcs-plugin/xfwm4_plugin.c:1711 mcs-plugin/xfwm4_plugin_orig.c:1425
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr "鼠標移到螢幕邊緣時迴繞工作區"
 
-#: mcs-plugin/xfwm4_plugin.c:1715
+#: mcs-plugin/xfwm4_plugin.c:1716 mcs-plugin/xfwm4_plugin_orig.c:1430
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr "拖曳視窗離開螢幕時回繞工作區"
 
-#: mcs-plugin/xfwm4_plugin.c:1725
+#: mcs-plugin/xfwm4_plugin.c:1726 mcs-plugin/xfwm4_plugin_orig.c:1440
 msgid "Edge Resistance :"
 msgstr "螢幕邊緣阻力："
 
-#: mcs-plugin/xfwm4_plugin.c:1752
+#: mcs-plugin/xfwm4_plugin.c:1753 mcs-plugin/xfwm4_plugin_orig.c:1467
 msgid "Opaque move and resize"
 msgstr "移動和縮放時顯示其內容"
 
-#: mcs-plugin/xfwm4_plugin.c:1760
+#: mcs-plugin/xfwm4_plugin.c:1761 mcs-plugin/xfwm4_plugin_orig.c:1475
 msgid "Display content of windows when resizing"
 msgstr "縮放視窗時顯示其內容"
 
-#: mcs-plugin/xfwm4_plugin.c:1765
+#: mcs-plugin/xfwm4_plugin.c:1766 mcs-plugin/xfwm4_plugin_orig.c:1480
 msgid "Display content of windows when moving"
 msgstr "移動視窗時顯示其內容"
 
-#: mcs-plugin/xfwm4_plugin.c:1770
+#: mcs-plugin/xfwm4_plugin.c:1771 mcs-plugin/xfwm4_plugin_orig.c:1485
 msgid "Double click action"
 msgstr "雙擊執行動作"
 
-#: mcs-plugin/xfwm4_plugin.c:1776
+#: mcs-plugin/xfwm4_plugin.c:1777 mcs-plugin/xfwm4_plugin_orig.c:1491
 msgid "Action to perform when double clicking on title bar :"
 msgstr "雙擊標題列執行的動作："
 
-#: mcs-plugin/xfwm4_plugin.c:1778
+#: mcs-plugin/xfwm4_plugin.c:1779 mcs-plugin/xfwm4_plugin_orig.c:1493
 msgid "Advanced"
 msgstr "進階"
 
-#: src/events.c:1616
+#: mcs-plugin/xfwm4_plugin_orig.c:1297
+#, fuzzy
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"自動為新建立\n"
+"視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1310
+#, fuzzy
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"當視窗獲取焦點時\n"
+"自動將該視窗置頂"
+
+#: mcs-plugin/xfwm4_plugin_orig.c:1352
+#, fuzzy
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"點選視窗內部時\n"
+"將視窗置頂"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:64 mcs-plugin/xfwm4_shortcuteditor.c:439
+#, fuzzy
+msgid "Close window"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:74 mcs-plugin/xfwm4_shortcuteditor.c:447
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "最大化視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:79 mcs-plugin/xfwm4_shortcuteditor.c:451
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "最大化視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:94 mcs-plugin/xfwm4_shortcuteditor.c:463
+#, fuzzy
+msgid "Stick window"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:99 mcs-plugin/xfwm4_shortcuteditor.c:467
+#, fuzzy
+msgid "Cycle windows"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:104 mcs-plugin/xfwm4_shortcuteditor.c:471
+#, fuzzy
+msgid "Move window up"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:109 mcs-plugin/xfwm4_shortcuteditor.c:475
+#, fuzzy
+msgid "Move window down"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:114 mcs-plugin/xfwm4_shortcuteditor.c:479
+#, fuzzy
+msgid "Move window left"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:119 mcs-plugin/xfwm4_shortcuteditor.c:483
+#, fuzzy
+msgid "Move window right"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:124 mcs-plugin/xfwm4_shortcuteditor.c:487
+#, fuzzy
+msgid "Resize window up"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:129 mcs-plugin/xfwm4_shortcuteditor.c:491
+#, fuzzy
+msgid "Resize window down"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:134 mcs-plugin/xfwm4_shortcuteditor.c:495
+#, fuzzy
+msgid "Resize window left"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:139 mcs-plugin/xfwm4_shortcuteditor.c:499
+#, fuzzy
+msgid "Resize window right"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:144 mcs-plugin/xfwm4_shortcuteditor.c:503
+#, fuzzy
+msgid "Raise window"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:149 mcs-plugin/xfwm4_shortcuteditor.c:507
+#, fuzzy
+msgid "Lower window"
+msgstr "隱藏視窗"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:154 mcs-plugin/xfwm4_shortcuteditor.c:511
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:159 mcs-plugin/xfwm4_shortcuteditor.c:515
+#, fuzzy
+msgid "Next workspace"
+msgstr "迴繞工作區"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:164 mcs-plugin/xfwm4_shortcuteditor.c:519
+#, fuzzy
+msgid "Previous workspace"
+msgstr "迴繞工作區"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:169 mcs-plugin/xfwm4_shortcuteditor.c:523
+#, fuzzy
+msgid "Add workspace"
+msgstr "迴繞工作區"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:174 mcs-plugin/xfwm4_shortcuteditor.c:527
+#, fuzzy
+msgid "Delete workspace"
+msgstr "迴繞工作區"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:179 mcs-plugin/xfwm4_shortcuteditor.c:531
+#, fuzzy
+msgid "Workspace 1"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:184 mcs-plugin/xfwm4_shortcuteditor.c:535
+#, fuzzy
+msgid "Workspace 2"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:189 mcs-plugin/xfwm4_shortcuteditor.c:539
+#, fuzzy
+msgid "Workspace 3"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:194 mcs-plugin/xfwm4_shortcuteditor.c:543
+#, fuzzy
+msgid "Workspace 4"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:199 mcs-plugin/xfwm4_shortcuteditor.c:547
+#, fuzzy
+msgid "Workspace 5"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:204 mcs-plugin/xfwm4_shortcuteditor.c:551
+#, fuzzy
+msgid "Workspace 6"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:209 mcs-plugin/xfwm4_shortcuteditor.c:555
+#, fuzzy
+msgid "Workspace 7"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:214 mcs-plugin/xfwm4_shortcuteditor.c:559
+#, fuzzy
+msgid "Workspace 8"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:219 mcs-plugin/xfwm4_shortcuteditor.c:563
+#, fuzzy
+msgid "Workspace 9"
+msgstr "工作區 %i"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:224 mcs-plugin/xfwm4_shortcuteditor.c:567
+#, fuzzy
+msgid "Move window to next workspace"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:229 mcs-plugin/xfwm4_shortcuteditor.c:571
+#, fuzzy
+msgid "Move window to previous workspace"
+msgstr "迴繞工作區"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:234 mcs-plugin/xfwm4_shortcuteditor.c:575
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:239 mcs-plugin/xfwm4_shortcuteditor.c:579
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:244 mcs-plugin/xfwm4_shortcuteditor.c:583
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:249 mcs-plugin/xfwm4_shortcuteditor.c:587
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:254 mcs-plugin/xfwm4_shortcuteditor.c:591
+#, fuzzy
+msgid "Move window to workspace 5"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:259 mcs-plugin/xfwm4_shortcuteditor.c:595
+#, fuzzy
+msgid "Move window to workspace 6"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:264 mcs-plugin/xfwm4_shortcuteditor.c:599
+#, fuzzy
+msgid "Move window to workspace 7"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:269 mcs-plugin/xfwm4_shortcuteditor.c:603
+#, fuzzy
+msgid "Move window to workspace 8"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:274 mcs-plugin/xfwm4_shortcuteditor.c:607
+#, fuzzy
+msgid "Move window to workspace 9"
+msgstr "新視窗獲取焦點"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:655
+msgid "Cannot open the theme directory !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:674
+#, c-format
+msgid ""
+"Cannot open %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:689 mcs-plugin/xfwm4_shortcuteditor.c:700
+#, c-format
+msgid ""
+"Cannot write in %s : \n"
+"%s"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:763
+msgid "Select command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:865
+msgid ""
+"Shortcut already in use !\n"
+"Are you sure you want to use it ?"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:927
+#, fuzzy
+msgid "Compose shortcut for :"
+msgstr "快速鍵"
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:930
+#: mcs-plugin/xfwm4_shortcuteditor.c:1109
+#, fuzzy
+msgid "Compose shortcut"
+msgstr "快速鍵"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:962
+#: mcs-plugin/xfwm4_shortcuteditor.c:1140
+msgid "Cannot grab the keyboard"
+msgstr ""
+
+#. Create dialog
+#: mcs-plugin/xfwm4_shortcuteditor.c:1014
+msgid "Choose command"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1016
+#, fuzzy
+msgid "Command :"
+msgstr "快速鍵"
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1050
+msgid "The command doesn't exist or the file is not executable !"
+msgstr ""
+
+#: mcs-plugin/xfwm4_shortcuteditor.c:1106
+msgid "Compose shortcut for command :"
+msgstr ""
+
+#: src/events.c:1627
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: (尚)未支援的操作\n"
@@ -499,114 +796,6 @@ msgstr "切換到..."
 msgid "Unknown application!"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Close window"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Maximize window vertically"
-#~ msgstr "最大化視窗"
-
-#, fuzzy
-#~ msgid "Maximize window horizontally"
-#~ msgstr "最大化視窗"
-
-#, fuzzy
-#~ msgid "Stick window"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Cycle windows"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Move window up"
-#~ msgstr "新視窗獲取焦點"
-
-#, fuzzy
-#~ msgid "Move window down"
-#~ msgstr "新視窗獲取焦點"
-
-#, fuzzy
-#~ msgid "Move window left"
-#~ msgstr "新視窗獲取焦點"
-
-#, fuzzy
-#~ msgid "Resize window up"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Resize window down"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Resize window left"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Resize window right"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Raise window"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Lower window"
-#~ msgstr "隱藏視窗"
-
-#, fuzzy
-#~ msgid "Next workspace"
-#~ msgstr "迴繞工作區"
-
-#, fuzzy
-#~ msgid "Previous workspace"
-#~ msgstr "迴繞工作區"
-
-#, fuzzy
-#~ msgid "Add workspace"
-#~ msgstr "迴繞工作區"
-
-#, fuzzy
-#~ msgid "Delete workspace"
-#~ msgstr "迴繞工作區"
-
-#, fuzzy
-#~ msgid "Workspace 1"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 2"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 3"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 4"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 5"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 6"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 7"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 8"
-#~ msgstr "工作區 %i"
-
-#, fuzzy
-#~ msgid "Workspace 9"
-#~ msgstr "工作區 %i"
-
 #~ msgid "Decoration style"
 #~ msgstr "裝飾風格"
 
diff --git a/src/hints.c b/src/hints.c
index 8e154cd045f0a43d5c850b1e02d43ec60b83cb86..7006da98bd0e367f59e3f767eb6eeb7e9fd4034f 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -109,7 +109,7 @@ Atom net_wm_window_type_dialog;
 Atom net_wm_window_type_dock;
 Atom net_wm_window_type_menu;
 Atom net_wm_window_type_normal;
-Atom net_wm_window_type_splashscreen;
+Atom net_wm_window_type_splash;
 Atom net_wm_window_type_toolbar;
 Atom net_wm_window_type_utility;
 Atom net_wm_user_time;
@@ -487,8 +487,8 @@ initNetHints (Display * dpy)
         XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_MENU", FALSE);
     net_wm_window_type_normal =
         XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_NORMAL", FALSE);
-    net_wm_window_type_splashscreen =
-        XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_SPLASHSCREEN", FALSE);
+    net_wm_window_type_splash =
+        XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_SPLASH", FALSE);
     net_wm_window_type_toolbar =
         XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", FALSE);
     net_wm_window_type_utility =
@@ -552,7 +552,7 @@ setNetSupportedHint (Display * dpy, int screen, Window check_win)
     atoms[i++] = net_wm_window_type_dock;
     atoms[i++] = net_wm_window_type_menu;
     atoms[i++] = net_wm_window_type_normal;
-    atoms[i++] = net_wm_window_type_splashscreen;
+    atoms[i++] = net_wm_window_type_splash;
     atoms[i++] = net_wm_window_type_toolbar;
     atoms[i++] = net_wm_window_type_utility;
     atoms[i++] = net_wm_user_time;
diff --git a/src/hints.h b/src/hints.h
index 7f1e07db0e38d1fed296f83b3a95ce5969f570d5..814fe8ba7fdd38cfff4ed69298064c706132a14d 100644
--- a/src/hints.h
+++ b/src/hints.h
@@ -190,7 +190,7 @@ extern Atom net_wm_window_type_dialog;
 extern Atom net_wm_window_type_dock;
 extern Atom net_wm_window_type_menu;
 extern Atom net_wm_window_type_normal;
-extern Atom net_wm_window_type_splashscreen;
+extern Atom net_wm_window_type_splash;
 extern Atom net_wm_window_type_toolbar;
 extern Atom net_wm_window_type_utility;
 extern Atom net_wm_user_time;
diff --git a/src/netwm.c b/src/netwm.c
index df9a6eb9c2af8045e6fc73e9f067e5cc106e24ca..60727a2c26b8a313b47bc802470e670c1f8e9cf5 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -608,7 +608,7 @@ clientGetNetWmType (Client * c)
                 || (atoms[i] == net_wm_window_type_dialog)
                 || (atoms[i] == net_wm_window_type_normal)
                 || (atoms[i] == net_wm_window_type_utility)
-                || (atoms[i] == net_wm_window_type_splashscreen))
+                || (atoms[i] == net_wm_window_type_splash))
             {
                 c->type_atom = atoms[i];
                 break;
@@ -917,9 +917,9 @@ clientWindowType (Client * c)
             FLAG_UNSET (c->flags,
                 CLIENT_FLAG_HAS_HIDE | CLIENT_FLAG_HAS_STICK);
         }
-        else if (c->type_atom == net_wm_window_type_splashscreen)
+        else if (c->type_atom == net_wm_window_type_splash)
         {
-            TRACE ("atom net_wm_window_type_splashscreen detected");
+            TRACE ("atom net_wm_window_type_splash detected");
             c->type = WINDOW_SPLASHSCREEN;
             c->initial_layer = WIN_LAYER_ABOVE_DOCK;
             FLAG_UNSET (c->flags,
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index e3736471875db55c9dcf0a94238dc746d40e695d..24b61e5860164efae27879d1de09ed29d0470969 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index f14e3ce21bafcc559ee7f8bb2b8adc4490723cf2..f6d559b2d1067c13b2b5d79a946221de245f4f99 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index f14ad7fca320583f523ff08ca562e3aaedd925df..48bd3901ce3a52f158a1c84430cb2b264c4ef83e 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -10,10 +10,10 @@ static char * top_left_active_xpm[] = {
 "%	c #D2CFCC s active_mid_2",
 "&	c #6F82A3 s active_mid_1",
 "*	c #A39C97 s active_shadow_2",
-"       ..",
-"******.++",
-"*@@@@.+##",
-"*@$$.+###",
+"        .",
+"******..+",
+"*@@@@.&+#",
+"*@$$.&###",
 "*@$$.####",
 "*@$.&####",
 "*@$.#####",
@@ -30,8 +30,8 @@ static char * top_left_active_xpm[] = {
 "*@$.#####",
 "*@$.&####",
 "*@$*.####",
-"*@$%.####",
-"*@$%*.###",
-"*@$$%*.##",
-"*@$$$%*..",
+"*@$%.&###",
+"*@$%*.&##",
+"*@$$%*..#",
+"*@$$$%**.",
 "*@$$$$%%*"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index f14e3ce21bafcc559ee7f8bb2b8adc4490723cf2..f6d559b2d1067c13b2b5d79a946221de245f4f99 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 05bac60d3b24de45dc6c25c80920d3625aa27170..b25f6f42d0f8b7603df1a228e37ba2bec11c6220 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -10,10 +10,10 @@ static char * top_left_inactive_xpm[] = {
 "%	c #D2CFCC s inactive_mid_2",
 "&	c #6F82A3 s inactive_mid_1",
 "*	c #A39C97 s inactive_shadow_2",
-"       ..",
-"******.++",
-"*@@@@.+##",
-"*@$$.+###",
+"        .",
+"******..+",
+"*@@@@.&+#",
+"*@$$.&###",
 "*@$$.####",
 "*@$.&####",
 "*@$.#####",
@@ -30,8 +30,8 @@ static char * top_left_inactive_xpm[] = {
 "*@$.#####",
 "*@$.&####",
 "*@$*.####",
-"*@$%.####",
-"*@$%*.###",
-"*@$$%*.##",
-"*@$$$%*..",
+"*@$%.&###",
+"*@$%*.&##",
+"*@$$%*..#",
+"*@$$$%**.",
 "*@$$$$%%*"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index c5e8a33b428528aedf7c4f38daaa276af283494e..8512d6d54ba73303627fe8d967006cb37b4215e3 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 01fffd73a418f79bbfb47bf7174e7b6981788326..ce40777f992d1050ae7757c76e7c17bb82053f0f 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -10,10 +10,10 @@ static char * top_right_active_xpm[] = {
 "%	c #D2CFCC s active_mid_2",
 "&	c #6F82A3 s active_mid_1",
 "*	c #A39C97 s active_shadow_2",
-"..       ",
-"++.******",
-"@@+.###$*",
-"@@@+.$%%*",
+".        ",
+"+..******",
+"@+&.###$*",
+"@@@&.$%%*",
 "@@@@.$%%*",
 "@@@@&.%%*",
 "@@@@@.%%*",
@@ -30,8 +30,8 @@ static char * top_right_active_xpm[] = {
 "@@@@@.%%*",
 "@@@@&.%%*",
 "@@@@.*%%*",
-"@@@@.%%%*",
-"@@@.*%%%*",
-"@@.*%$%%*",
-"..*%$$%%*",
+"@@@&.%%%*",
+"@@&.*%%%*",
+"@..*%$%%*",
+".**%$$%%*",
 "*%%$$$%%*"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index c5e8a33b428528aedf7c4f38daaa276af283494e..8512d6d54ba73303627fe8d967006cb37b4215e3 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 4c169cab4f48300b2fd8e1f912bd3a4393d0c493..b7c177833d514f6bfa531811bdb40be2f65d532c 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -10,10 +10,10 @@ static char * top_right_inactive_xpm[] = {
 "%	c #D2CFCC s inactive_mid_2",
 "&	c #6F82A3 s inactive_mid_1",
 "*	c #A39C97 s inactive_shadow_2",
-"..       ",
-"++.******",
-"@@+.###$*",
-"@@@+.$%%*",
+".        ",
+"+..******",
+"@+&.###$*",
+"@@@&.$%%*",
 "@@@@.$%%*",
 "@@@@&.%%*",
 "@@@@@.%%*",
@@ -30,8 +30,8 @@ static char * top_right_inactive_xpm[] = {
 "@@@@@.%%*",
 "@@@@&.%%*",
 "@@@@.*%%*",
-"@@@@.%%%*",
-"@@@.*%%%*",
-"@@.*%$%%*",
-"..*%$$%%*",
+"@@@&.%%%*",
+"@@&.*%%%*",
+"@..*%$%%*",
+".**%$$%%*",
 "*%%$$$%%*"};