23 files changed, 501 insertions, 105 deletions
diff --git a/mcs-plugin/margins_plugin.c b/mcs-plugin/margins_plugin.c
index 7446a047e..a5c653b69 100644
--- a/mcs-plugin/margins_plugin.c
+++ b/mcs-plugin/margins_plugin.c
@@ -41,9 +41,9 @@
 #include "monitor-icon.h"
 #include "my_intl.h"
 
-#define RCFILE "borders.xml"
-#define PLUGIN_NAME "borders"
-#define MARGINS_CHANNEL "borders"
+#define RCFILE "margins.xml"
+#define PLUGIN_NAME "xfwm_margins"
+#define MARGINS_CHANNEL "margins"
 
 #define DEFAULT_ICON_SIZE 48
 #define BORDER 5
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a1803ebd..dc502bfd1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,19 @@
+mcs-plugin/margins_plugin.c
 mcs-plugin/xfwm4_plugin.c
 src/client.c
 src/events.c
+src/frame.c
 src/hints.c
+src/keyboard.c
 src/main.c
 src/menu.c
+src/misc.c
+src/mywindow.c
+src/parserc.c
+src/pixmap.c
+src/session.c
 src/settings.c
+src/spinning_cursor.c
+src/startup_notification.c
 src/tabwin.c
+src/workspaces.c
diff --git a/po/ar.gmo b/po/ar.gmo
index a9131e582..db05f7123 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
diff --git a/po/ar.po b/po/ar.po
index a120ab6f5..91692fcf5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-31 12:54+0100\n"
 "Last-Translator: Nabil Ben Khalifa <nabil_benkhalifa@yahoo.fr>\n"
 "Language-Team:  Arabic \n"
@@ -15,6 +15,43 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "يسار"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "يمين"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "عنوان"
@@ -366,37 +403,37 @@ msgstr "إعادة تشغيل"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: لم يتمكن GtkMenu من الإمساك بالمؤشر\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: هناك بيانات منقوصة في الملفات الإفتراضية"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: لا أستطيع تخصيص اللون النشط%s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: لا أستطيع تحليل اللون النشط %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: لا أستطيع تخصيص اللون غير النشط %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: لا أستطيع تحليل اللون غير النشط %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: هناك بيانات منقوصة في الملفات الإفتراضية"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr "%s:العد في بيئة العمل غير محدد, سأستخدم قيمة rc: %i"
diff --git a/po/de.gmo b/po/de.gmo
index 713224640..b7c4f0730 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 8161bf11c..e5ddf3e04 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-25 01:20+0100\n"
 "Last-Translator: Moritz Heiber <mistermoe@hackerboard.de>\n"
 "Language-Team: none <none@none>\n"
@@ -14,6 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Links"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Rechts"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Titelleiste"
@@ -366,37 +403,37 @@ msgstr "Neu starten"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenü hat Maus nicht gefunden\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Fehlende Einstellungen aus den Defaults"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: Kann aktive Farbe nicht setzen %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: Kann aktive Farbe nicht feststellen %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: Kann inaktive Farbe nicht setzen %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: Kann inaktive Farbe nicht feststellen %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Fehlende Einstellungen aus den Defaults"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr ""
diff --git a/po/es.gmo b/po/es.gmo
index 6675fce75..8695a1452 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 4829dd25f..ed3e56342 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\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"
@@ -15,6 +15,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Izquierda"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Derecha"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Título"
@@ -372,37 +409,37 @@ msgstr "Reiniciar"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu falló al intentar conseguir el puntero\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Faltan datos en ficheros de configuración por defecto"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: No se puede reservar el color activo %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: No se puede interpretar el color activo %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: No se puede reservar el color activo %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: No se puede interpretar el color inactivo %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Faltan datos en ficheros de configuración por defecto"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr ""
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index 3db57939e..212c81cb5 100644
--- a/po/es_MX.gmo
+++ b/po/es_MX.gmo
diff --git a/po/es_MX.po b/po/es_MX.po
index b436e79a4..9b7545325 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\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"
@@ -15,6 +15,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Izquierda"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Derecha"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Título"
@@ -372,37 +409,37 @@ msgstr "Reiniciar"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu no pudo posesionarse del puntero\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Faltan datos en archivos de configuración por omisión"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: No se puede reservar el color activo %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: No se puede interpretar el color activo %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: No se puede reservar el color inactivo %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: No se puede interpretar el color inactivo %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Faltan datos en archivos de configuración por omisión"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr ""
diff --git a/po/fi.gmo b/po/fi.gmo
index fe3d12601..97c7fc44c 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index a86be6c8c..52f7cd7a2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Ilkka Ollakka <ilkka.j.ollakka@students.oamk.fi>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,6 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Vasen"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Oikea"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Otsikko"
@@ -363,37 +400,37 @@ msgstr "KÃ€ynnistÃ€ uudelleen"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu epÃ€onnistui osoittimen haltuunotossa\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Oletustiedostoista puuttuu tietoa"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: Aktiivista vÃ€riÃ€ %s ei voi kÃ€yttÃ€Ã€\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: Aktiivista vÃ€riÃ€ %s ei voi tunnistaa \n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: Ei-aktiivista vÃ€riÃ€ %s ei voi kÃ€yttÃ€Ã€\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: Ei-aktiivista vÃ€riÃ€ %s ei voi tunnistaa\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Oletustiedostoista puuttuu tietoa"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr "%s: TyÃ¶pÃ¶ytien mÃ€Ã€rÃ€Ã€ ei asetettu, kÃ€ytetÃ€Ã€n oletusarvoa: %i"
diff --git a/po/fr.gmo b/po/fr.gmo
index 4584ffaf5..676c0a917 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 157067c1f..df174a814 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,6 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Gauche"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Droit"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Titre"
@@ -367,37 +404,37 @@ msgstr "Redémarrer"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu n'a pas pu capturer le pointeur\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Il manque le ficher de défaut"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: Ne peut allouer la couleur active %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: Ne peut lire la couleur inactive %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: Ne peut allouer la couleur inactive %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: Ne peut lire la couleur inactive %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Il manque des données dans le ficher de défaut"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr ""
diff --git a/po/nl.gmo b/po/nl.gmo
index 907689dae..3910dca53 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 67f1750cb..922fe6316 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\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"
@@ -15,6 +15,43 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Links"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Rechts"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Titel"
@@ -364,37 +401,37 @@ msgstr "_Herstarten"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu kon de pointer niet vasthouden\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%: Ontbrekende gegevens uit standaard bestanden"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: Kan actieve kleur %s niet creëren\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: Kan actieve kleur %s niet vertalen\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: Kan inactieve kleur %s niet creëren\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: Kan inactieve kleur %s niet vertalen\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%: Ontbrekende gegevens uit standaard bestanden"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr "%s: Aantal bureaubladen niet ingesteld, waarde uit rc gebruiken: %i"
diff --git a/po/pl.gmo b/po/pl.gmo
index f0ce76862..e88208c71 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 816c9a7f8..4c5167d29 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Pawel Pastula <pastulap@poczta.onet.pl>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,6 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "Lewo"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "Prawo"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "Tytul"
@@ -365,37 +402,37 @@ msgstr ""
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu nie uzyskalo wskaznika\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: Brak danych z domyslnych plikow"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: Nie moge przypisac aktywnego koloru %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: Nie moge zidentyfikowac aktywnego koloru %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: Nie moge przypisac nieaktywnego koloru %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: Nie moge zidentyfikowac nieaktywnego koloru %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: Brak danych z domyslnych plikow"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr "%s: Liczba pulpitow nie ustawiona, uzywam wartosc: %i"
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index b6eb58d55..b39c8f4e1 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\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"
@@ -15,6 +15,41 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+msgid "Left :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:258
+msgid "Right :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr ""
@@ -360,37 +395,37 @@ msgstr ""
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr ""
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, c-format
 msgid "%s: Missing defaults file"
 msgstr ""
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr ""
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr ""
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr ""
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr ""
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, c-format
 msgid "%s: Missing values in defaults file"
 msgstr ""
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index a7e958200..fbdb4a6a8 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 329bc3b45..777ac60d7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-02-23 22:52+0100\n"
+"POT-Creation-Date: 2003-02-25 08:17+0100\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,6 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: mcs-plugin/margins_plugin.c:110
+msgid "Desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:190
+msgid "Adjust desktop margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:206
+msgid "Desktop Margins"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:210
+msgid ""
+"Margins are areas on the edges\n"
+"of the screen where no windows\n"
+"will be placed"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:238
+#, fuzzy
+msgid "Left :"
+msgstr "左侧"
+
+#: mcs-plugin/margins_plugin.c:258
+#, fuzzy
+msgid "Right :"
+msgstr "右侧"
+
+#: mcs-plugin/margins_plugin.c:278
+msgid "Top :"
+msgstr ""
+
+#: mcs-plugin/margins_plugin.c:298
+msgid "Bottom:"
+msgstr ""
+
 #: mcs-plugin/xfwm4_plugin.c:117
 msgid "Title"
 msgstr "标题"
@@ -365,37 +402,37 @@ msgstr "重启"
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu 无法获取鼠标\n"
 
-#: src/settings.c:179
+#: src/settings.c:257
 #, fuzzy, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: 默认文件中缺少数据"
 
-#: src/settings.c:333
+#: src/settings.c:431
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: 无法分配所选颜色 %s\n"
 
-#: src/settings.c:339
+#: src/settings.c:437
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: 无法解释所选颜色 %s\n"
 
-#: src/settings.c:377
+#: src/settings.c:475
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: 无法分配 inactive 颜色 %s\n"
 
-#: src/settings.c:383
+#: src/settings.c:481
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: 无法解释 inactive颜色 %s\n"
 
-#: src/settings.c:504
+#: src/settings.c:602
 #, fuzzy, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: 默认文件中缺少数据"
 
-#: src/settings.c:763
+#: src/settings.c:871
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
 msgstr "%s: 未设置工作区个数，使用rc文件值: %i"
diff --git a/src/client.c b/src/client.c
index 9871a93f8..a078d78bd 100644
--- a/src/client.c
+++ b/src/client.c
@@ -100,7 +100,7 @@ static void clientSetHeight(Client * c, int h1);
 static inline Client *clientGetTopMost(int layer, Client * exclude);
 static inline Client *clientGetBottomMost(int layer, Client * exclude);
 static inline void clientComputeStackList(Client * c, Client * sibling, int mask, XWindowChanges * wc);
-static inline void clientConstraintPos(Client * c, gboolean show_title);
+static inline void clientConstraintPos(Client * c, gboolean show_full);
 static inline void clientKeepVisible(Client * c);
 static inline unsigned long overlap(int x0, int y0, int x1, int y1, int tx0, int ty0, int tx1, int ty1);
 static void clientInitPosition(Client * c);
@@ -1396,13 +1396,13 @@ static inline void clientComputeStackList(Client * c, Client * sibling, int mask
 /* clientConstraintPos() is used when moving windows 
    to ensure that the window stays accessible to the user
  */
-static inline void clientConstraintPos(Client * c, gboolean show_title)
+static inline void clientConstraintPos(Client * c, gboolean show_full)
 {
     int cx, cy, left, right, top, bottom;
     gboolean leftMostHead, rightMostHead, topMostHead, bottomMostHead;
     
     g_return_if_fail(c != NULL);
-    DBG("entering clientConstraintPos %s\n", show_title ? "(with show title)" : "(w/out show title)");
+    DBG("entering clientConstraintPos %s\n", show_title ? "(with show full)" : "(w/out show full)");
     DBG("client \"%s\" (%#lx)\n", c->name, c->window);
     
     if(!CLIENT_FLAG_TEST(c, CLIENT_FLAG_MANAGED) || CLIENT_FLAG_TEST(c, CLIENT_FLAG_FULLSCREEN))
@@ -1424,26 +1424,43 @@ static inline void clientConstraintPos(Client * c, gboolean show_title)
     top    = (topMostHead ? (int)margins[MARGIN_TOP] : 0);
     bottom = (bottomMostHead ? (int)margins[MARGIN_BOTTOM] : 0);
 
-    if(leftMostHead && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HAS_BORDER) && ((c->x + c->width) < MyDisplayX(cx, cy) + CLIENT_MIN_VISIBLE + left))
-    {
-        c->x = MyDisplayX(cx, cy) + CLIENT_MIN_VISIBLE + left - c->width;
-    }
-    else if(rightMostHead && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HAS_BORDER) && (c->x + CLIENT_MIN_VISIBLE > MyDisplayMaxX(dpy, screen, cx, cy) - right))
-    {
-        c->x = MyDisplayMaxX(dpy, screen, cx, cy) - right - CLIENT_MIN_VISIBLE;
+    if (show_full)
+    {
+	if(rightMostHead && (frameX(c) < MyDisplayX(cx, cy) + left))
+	{
+            c->x = MyDisplayX(cx, cy) + left + frameLeft(c);
+	}
+	else if(leftMostHead && (frameX(c) + frameWidth(c) > MyDisplayMaxX(dpy, screen, cx, cy) - right))
+	{
+            c->x = MyDisplayMaxX(dpy, screen, cx, cy) - right - frameWidth(c) + frameLeft(c);
+	}
+	if(topMostHead && (frameY(c) < MyDisplayY(cx, cy) + top))
+	{
+            c->y = MyDisplayY(cx, cy) + top + frameTop(c);
+	}
+	else if(topMostHead && (frameY(c) + frameHeight(c) > MyDisplayMaxY(dpy, screen, cx, cy) - bottom))
+	{
+            c->y = MyDisplayMaxY(dpy, screen, cx, cy) - bottom - frameHeight(c) + frameTop(c);
+	}
     }
-    /* The top of screen is treated differently because the title bar of a window
-       should not disappear under a dock placed on top of the screen. Here we don't
-       check to see if the window has a border because we want to take into account
-       undecorated windows such as XMMS or others
-     */
-    if(topMostHead && (c->y + (show_title ? -frameTop(c) : c->height) < MyDisplayY(cx, cy) + (show_title ? 0 : CLIENT_MIN_VISIBLE) + top))
-    {
-        c->y = MyDisplayY(cx, cy) + top + (show_title ? frameTop(c) : CLIENT_MIN_VISIBLE - c->height);
-    }
-    else if(bottomMostHead && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HAS_BORDER) && (c->y + CLIENT_MIN_VISIBLE > MyDisplayMaxY(dpy, screen, cx, cy) - bottom))
+    else
     {
-        c->y = MyDisplayMaxY(dpy, screen, cx, cy) - bottom - CLIENT_MIN_VISIBLE;
+	if(leftMostHead && ((c->x + c->width) < MyDisplayX(cx, cy) + CLIENT_MIN_VISIBLE + left))
+	{
+	    c->x = MyDisplayX(cx, cy) + CLIENT_MIN_VISIBLE + left - c->width;
+	}
+	else if(rightMostHead && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HAS_BORDER) && (c->x + CLIENT_MIN_VISIBLE > MyDisplayMaxX(dpy, screen, cx, cy) - right))
+	{
+	    c->x = MyDisplayMaxX(dpy, screen, cx, cy) - right - CLIENT_MIN_VISIBLE;
+	}
+	if(topMostHead && (c->y + c->height < MyDisplayY(cx, cy) + CLIENT_MIN_VISIBLE + top))
+	{
+	    c->y = MyDisplayY(cx, cy) + CLIENT_MIN_VISIBLE + top - c->height;
+	}
+	else if(bottomMostHead && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HAS_BORDER) && (c->y + CLIENT_MIN_VISIBLE > MyDisplayMaxY(dpy, screen, cx, cy) - bottom))
+	{
+	    c->y = MyDisplayMaxY(dpy, screen, cx, cy) - bottom - CLIENT_MIN_VISIBLE;
+	}
     }
 }
 
diff --git a/src/settings.c b/src/settings.c
index 4cc01bb4c..bf0347ab7 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -37,7 +37,7 @@
 #include "my_intl.h"
 
 #define CHANNEL1 "xfwm4"
-#define CHANNEL2 "borders"
+#define CHANNEL2 "margins"
 #define TOINT(x) (x ? atoi(x) : 0)
 
 Params params;