diff --git a/configure b/configure
index e924f6f87f98722c7be009ab1a8fe1532b72791e..d214200707d42c38d7f9a71f63556135b64aecff 100755
--- a/configure
+++ b/configure
@@ -19727,8 +19727,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-  ALL_LINGUAS="ar az ca cs de es es_MX fi fr hi hu ja ko lt ms nl pl pt_PT
-	 ru sv ta tr uk vi zh_CN zh_TW"
+  ALL_LINGUAS="ar az ca cs de es es_MX fa_IR fi fr hi hu ja ko lt ms nl pl
+	 pt_BR pt_PT ru sv ta tr uk vi zh_CN zh_TW"
 
 
 
diff --git a/configure.ac b/configure.ac
index 6329064b80320201435645ff90d982bb12c88c17..9a3b7814674eb44c9cd193e3132446957633210f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@ AC_HEADER_STDC
 AC_CHECK_FUNCS([daemon setsid])
 
 dnl Check for i18n support
-BM_I18N([xfwm4], [ar az ca cs de es es_MX fi fr hi hu ja ko lt ms nl pl pt_PT
-	 ru sv ta tr uk vi zh_CN zh_TW])
+BM_I18N([xfwm4], [ar az ca cs de es es_MX fa_IR fi fr hi hu ja ko lt ms nl pl
+	 pt_BR pt_PT ru sv ta tr uk vi zh_CN zh_TW])
 
 dnl Check for X11 window system
 BM_LIBX11_REQUIRE
diff --git a/po/es.gmo b/po/es.gmo
index 674cd4286648fd8350c0cb10c62e33a62c50cb0c..d6e15d5702e5fd3a0acb337d054fe3f49c272bf8 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 4d33fb93dd2e441a06d40ef69d8248fe327fb61b..9652e0a7c9331ed1edc625b64b42b2d2fe483953 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
 "POT-Creation-Date: 2004-01-03 22:16+0100\n"
-"PO-Revision-Date: 2003-01-23 22:06+0100\n"
-"Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\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"
@@ -20,74 +20,74 @@ msgstr ""
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
-"los bordes son areas en los lados de la pantalla donde no se colocará "
+"Los bordes son áreas a los lados de la pantalla donde no se colocará "
 "ninguna ventana"
 
 #: mcs-plugin/margins.c:131
 #, fuzzy
 msgid "Workspace Margins"
-msgstr "Esc_ritorio"
+msgstr "Márgenes del Escritorio"
 
 #: mcs-plugin/margins.c:159
 #, fuzzy
 msgid "Left :"
-msgstr "Izquierda"
+msgstr "Izquierda :"
 
 #: mcs-plugin/margins.c:179
 #, fuzzy
 msgid "Right :"
-msgstr "Derecha"
+msgstr "Derecha :"
 
 #: mcs-plugin/margins.c:199
 msgid "Top :"
-msgstr "Arriba"
+msgstr "Arriba :"
 
 #: mcs-plugin/margins.c:219
 msgid "Bottom :"
-msgstr "Abajo"
+msgstr "Abajo :"
 
 #: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
 #, fuzzy
 msgid "Workspaces and Margins"
-msgstr "Esc_ritorio"
+msgstr "Escritorios y Márgenes"
 
 #. Number of workspaces
 #: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
 #, fuzzy
 msgid "Workspaces"
-msgstr "Esc_ritorio"
+msgstr "Escritorios"
 
 #: mcs-plugin/plugin.c:179
 msgid "Margins"
-msgstr ""
+msgstr "Márgenes"
 
 #: mcs-plugin/workspaces.c:337
 msgid "Change name"
-msgstr ""
+msgstr "Cambiar nombre"
 
 #: mcs-plugin/workspaces.c:349
 #, fuzzy, c-format
 msgid "Workspace %d"
-msgstr "Esc_ritorio"
+msgstr "Escritorio %d"
 
 #: mcs-plugin/workspaces.c:359
 msgid "Name:"
-msgstr ""
+msgstr "Nombre :"
 
 #: mcs-plugin/workspaces.c:447
 msgid "Click on a workspace name to edit it"
-msgstr ""
+msgstr "Pinche en el nombre de escritorio para editarlo"
 
 #: mcs-plugin/workspaces.c:519
 #, fuzzy
 msgid "Number of workspaces:"
-msgstr "Saltar al escritorio siguiente"
+msgstr "Número de escritorios"
 
 #. Workspace names
 #: mcs-plugin/workspaces.c:550
 #, fuzzy
 msgid "Workspace names"
-msgstr "Esc_ritorio"
+msgstr "Nombres de escritorio"
 
 #: mcs-plugin/xfwm4_plugin.c:116
 msgid "Title"
@@ -176,7 +176,7 @@ msgstr "Alineado del texto dentro de la barra de título :"
 
 #: mcs-plugin/xfwm4_plugin.c:1349
 msgid "Button layout"
-msgstr "Disposición de los Botones"
+msgstr "Disposición de los botones"
 
 #: mcs-plugin/xfwm4_plugin.c:1356
 msgid "Decoration style"
@@ -280,16 +280,16 @@ msgstr "Saltar al escritorio siguiente"
 
 #: mcs-plugin/xfwm4_plugin.c:1609
 msgid "Wrap workspaces when the pointer reaches a screen edge"
-msgstr "Saltar al siguiente escritorio al mover el puntero"
+msgstr "Saltar al siguiente escritorio cuando el puntero llegue al borde del escritorio"
 
 #: mcs-plugin/xfwm4_plugin.c:1618
 #, fuzzy
 msgid "Wrap workspaces when dragging a window off the screen"
-msgstr "Saltar al siguiente escritorio al mover ventanas"
+msgstr "Saltar al siguiente escritorio al arrastrar las ventanas fuera del escritorio actual"
 
 #: mcs-plugin/xfwm4_plugin.c:1630
 msgid "Edge Resistance :"
-msgstr "Resistencia en la orilla :"
+msgstr "Resistencia en los bordes :"
 
 #: mcs-plugin/xfwm4_plugin.c:1671
 msgid "Opaque move and resize"
@@ -307,11 +307,11 @@ msgstr "Mostrar contenido de la ventana cuando se mueva"
 
 #: mcs-plugin/xfwm4_plugin.c:1695
 msgid "Double click action"
-msgstr "Acción al pinchar dos veces"
+msgstr "Acción al hacer doble click"
 
 #: mcs-plugin/xfwm4_plugin.c:1701
 msgid "Action to perform when double clicking on title bar :"
-msgstr "Acción a realizar cuando se pinche dos veces la barra de título :"
+msgstr "Acción a realizar cuando se haga doble click en la barra de título :"
 
 #: mcs-plugin/xfwm4_plugin.c:1706
 msgid "Advanced"
@@ -320,7 +320,7 @@ msgstr "Avanzado"
 #: src/client.c:508
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
-msgstr "%s: net_wm_state sin soporte (ventana %#lx)"
+msgstr "%s: net_wm_state sin soporte (ventana 0x%lx)"
 
 #: src/events.c:1490
 #, c-format
@@ -345,12 +345,12 @@ msgstr "%s: Faltan datos en ficheros de configuración por defecto"
 #: src/main.c:413
 #, c-format
 msgid "%s: Failed to enter daemon mode: %s"
-msgstr ""
+msgstr "%s: No se pudo entrar en modo demonio"
 
 #: src/main.c:421
 #, c-format
 msgid "%s: Failed to create new process: %s"
-msgstr ""
+msgstr "%s: No se pudo crear un nuevo proceso: %s"
 
 #: src/main.c:442
 #, c-format
@@ -395,11 +395,11 @@ msgstr "Des_pegar"
 
 #: src/menu.c:51
 msgid "Context _help"
-msgstr ""
+msgstr "Ayuda de contexto"
 
 #: src/menu.c:52 src/menu.c:53
 msgid "Always on top"
-msgstr ""
+msgstr "Siempre encima"
 
 #: src/menu.c:54
 #, fuzzy
@@ -425,7 +425,7 @@ msgstr "Reiniciar"
 #: src/menu.c:166
 #, fuzzy, c-format
 msgid "Workspace %i"
-msgstr "Esc_ritorio"
+msgstr "Escritorio %i"
 
 #: src/menu.c:408
 #, c-format
@@ -460,7 +460,7 @@ msgstr "%s: No se puede interpretar el color inactivo %s\n"
 #: src/settings.c:798
 #, c-format
 msgid "%s: specified key theme \"%s\" missing, using default"
-msgstr ""
+msgstr "%s: Falta el mapa de teclado especificado \"%s\", usando el de por defecto"
 
 #: src/settings.c:808
 #, fuzzy, c-format
@@ -507,7 +507,7 @@ msgstr "Cambiar a ..."
 #~ msgstr "Pegar al borde del escritorio"
 
 #~ msgid "%s: Property %s on window 0x%lx contains invalid UTF-8 characters\n"
-#~ msgstr "%s: Propiedad %s en ventana 0x%lx contiene UTF-8 inválido\n"
+#~ msgstr "%s: Propiedad %s en ventana 0x%lx contiene caracteres UTF-8 inválidos\n"
 
 #~ msgid "%s: Using GTK+-%d.%d.%d"
 #~ msgstr "%s: Usando GTK+-%d.%d.%d"
@@ -519,7 +519,7 @@ msgstr "Cambiar a ..."
 #~ msgstr "Disposición :"
 
 #~ msgid "%s: Unidentified client message for window 0x%lx"
-#~ msgstr "%s: Mensaje no identificado, ventana 0x%lx"
+#~ msgstr "%s: Mensaje cliente no identificado para ventana 0x%lx"
 
 #~ msgid "Init complete"
 #~ msgstr "Arranque completo"
diff --git a/po/fa_IR.gmo b/po/fa_IR.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..dc885673fcbcf96c98e35e534be1a20e4fee6113
Binary files /dev/null and b/po/fa_IR.gmo differ
diff --git a/po/fa_IR.po b/po/fa_IR.po
new file mode 100644
index 0000000000000000000000000000000000000000..9b9413c659e3cb1a3f91a6d96bf5b36e84807ec1
--- /dev/null
+++ b/po/fa_IR.po
@@ -0,0 +1,464 @@
+# translation of xfwm4.fa_IR.po to Persian
+# translation of xfwm4.po to Persian
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Abbas Izad <abbasizad@hotmail.com>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfwm4.fa_IR\n"
+"POT-Creation-Date: 2004-01-04 23:17+0100\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"
+"X-Generator: KBabel 1.0.2\n"
+
+#: mcs-plugin/margins.c:124
+msgid "Margins are areas on the edges of the screen where no window will be placed"
+msgstr "حاشیه‌ها مناطقی بر لبه‌های صفحه هستند که پنجره‌ها در آنجا گذارده نخواهند شد."
+
+#: mcs-plugin/margins.c:131
+msgid "Workspace Margins"
+msgstr "حاشیه‌های فضای کاری"
+
+#: mcs-plugin/margins.c:159
+msgid "Left :"
+msgstr "Ú†Ù¾ :"
+
+#: mcs-plugin/margins.c:179
+msgid "Right :"
+msgstr "راست :"
+
+#: mcs-plugin/margins.c:199
+msgid "Top :"
+msgstr "بالا :"
+
+#: mcs-plugin/margins.c:219
+msgid "Bottom :"
+msgstr "انتها :"
+
+#: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
+msgid "Workspaces and Margins"
+msgstr "فضاهای کاری و حاشیه‌ها"
+
+#. Number of workspaces
+#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
+msgid "Workspaces"
+msgstr "فضاهای کاری"
+
+#: mcs-plugin/plugin.c:179
+msgid "Margins"
+msgstr "حاشیه‌ها"
+
+#: mcs-plugin/workspaces.c:337
+msgid "Change name"
+msgstr "تغییر نام"
+
+#: mcs-plugin/workspaces.c:349
+#, c-format
+msgid "Workspace %d"
+msgstr "فضای کاری %d"
+
+#: mcs-plugin/workspaces.c:359
+msgid "Name:"
+msgstr "نام:"
+
+#: mcs-plugin/workspaces.c:447
+msgid "Click on a workspace name to edit it"
+msgstr "بر نام فضای کاریی برای ویرایش آن کلیک کنید"
+
+#: mcs-plugin/workspaces.c:519
+msgid "Number of workspaces:"
+msgstr "تعداد فضاهای کاری:"
+
+#. Workspace names
+#: mcs-plugin/workspaces.c:550
+msgid "Workspace names"
+msgstr "نام‌های فضای کاری"
+
+#: mcs-plugin/xfwm4_plugin.c:116
+msgid "Title"
+msgstr "عنوان"
+
+#: mcs-plugin/xfwm4_plugin.c:117
+msgid "Menu"
+msgstr "فهرست"
+
+#: mcs-plugin/xfwm4_plugin.c:118
+msgid "Stick"
+msgstr "چسباندن"
+
+#: mcs-plugin/xfwm4_plugin.c:119
+msgid "Shade"
+msgstr "سایه"
+
+#: mcs-plugin/xfwm4_plugin.c:120
+msgid "Hide"
+msgstr "پنهان کردن"
+
+#: mcs-plugin/xfwm4_plugin.c:121
+msgid "Maximize"
+msgstr "بزرگ‌سازی"
+
+#: mcs-plugin/xfwm4_plugin.c:122
+msgid "Close"
+msgstr "بستن"
+
+#: mcs-plugin/xfwm4_plugin.c:126
+msgid "Shade window"
+msgstr "سایه زدن پنجره"
+
+#: mcs-plugin/xfwm4_plugin.c:127
+msgid "Hide window"
+msgstr "پنهان کردن پنجره"
+
+#: mcs-plugin/xfwm4_plugin.c:128
+msgid "Maximize window"
+msgstr "بزرگ‌سازی پنجره"
+
+#: mcs-plugin/xfwm4_plugin.c:129
+msgid "Nothing"
+msgstr "هیچی"
+
+#: mcs-plugin/xfwm4_plugin.c:134
+msgid "Left"
+msgstr "Ú†Ù¾"
+
+#: mcs-plugin/xfwm4_plugin.c:135
+msgid "Center"
+msgstr "مرکز"
+
+#: mcs-plugin/xfwm4_plugin.c:136
+msgid "Right"
+msgstr "راست"
+
+#: mcs-plugin/xfwm4_plugin.c:436
+msgid "Hidden"
+msgstr "پنهان"
+
+#: mcs-plugin/xfwm4_plugin.c:1206
+msgid "Font Selection Dialog"
+msgstr "گفتگوی گزینش قلم‌نگارش"
+
+#: mcs-plugin/xfwm4_plugin.c:1274 mcs-plugin/xfwm4_plugin.c:1845
+msgid "Window Manager"
+msgstr "مدیر پنجره‌"
+
+#: mcs-plugin/xfwm4_plugin.c:1288
+msgid "Window Manager Preferences"
+msgstr "ترجیحات مدیر پنجره"
+
+#: mcs-plugin/xfwm4_plugin.c:1325
+msgid "Title font"
+msgstr "قلم‌نگارش عنوان"
+
+#: mcs-plugin/xfwm4_plugin.c:1338
+msgid "Title Alignment"
+msgstr "همترازی عنوان"
+
+#. XXX
+#: mcs-plugin/xfwm4_plugin.c:1344
+msgid "Text alignment inside title bar :"
+msgstr "همترازی متن درون نوار عنوان :"
+
+#: mcs-plugin/xfwm4_plugin.c:1349
+msgid "Button layout"
+msgstr "طرح دکمه"
+
+#: mcs-plugin/xfwm4_plugin.c:1356
+msgid "Decoration style"
+msgstr "سبک تزئین"
+
+#: mcs-plugin/xfwm4_plugin.c:1369
+msgid "Keyboard Shortcut"
+msgstr "میان‌بر صفحه‌کلید"
+
+#: mcs-plugin/xfwm4_plugin.c:1393
+msgid "Focus model"
+msgstr "مدل تمرکز"
+
+#: mcs-plugin/xfwm4_plugin.c:1402
+msgid "Click to focus"
+msgstr "کلیک برای تمرکز"
+
+#: mcs-plugin/xfwm4_plugin.c:1416
+msgid "Focus follows mouse"
+msgstr "تمرکز به همراه موشی"
+
+#: mcs-plugin/xfwm4_plugin.c:1430
+msgid "New window focus"
+msgstr "تمرکز پنجره‌ی جدید"
+
+#: mcs-plugin/xfwm4_plugin.c:1435
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"تمرکز دادن خودکار به پنجره‌هایی \n"
+"که بتازگی ایجاد شده‌اند"
+
+#: mcs-plugin/xfwm4_plugin.c:1442
+msgid "Raise on focus"
+msgstr "برافرازی با تمرکز"
+
+#: mcs-plugin/xfwm4_plugin.c:1451
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"برافرازی پنجره بطور خودکار وقتی \n"
+"آنها تمرکز را دریافت می‌کنند"
+
+#: mcs-plugin/xfwm4_plugin.c:1464
+msgid "Delay before raising focused window :"
+msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
+
+#: mcs-plugin/xfwm4_plugin.c:1472
+msgid "Slow"
+msgstr "آهسته"
+
+#: mcs-plugin/xfwm4_plugin.c:1480
+msgid "Fast"
+msgstr "سریع"
+
+#: mcs-plugin/xfwm4_plugin.c:1504
+msgid "Raise on click"
+msgstr "برافرازی با کلیک کردن"
+
+#: mcs-plugin/xfwm4_plugin.c:1509
+msgid ""
+"Raise window when clicking inside\n"
+"application window"
+msgstr ""
+"برافرازی پنجره وقتی داخل پنجره‌ی\n"
+"برنامه کلیک شود"
+
+#: mcs-plugin/xfwm4_plugin.c:1517
+msgid "Keyboard and focus"
+msgstr "صفحه‌کلید و تمرکز"
+
+#: mcs-plugin/xfwm4_plugin.c:1530
+msgid "Windows snapping"
+msgstr "پنجره ربائی"
+
+#: mcs-plugin/xfwm4_plugin.c:1539
+msgid "Snap windows to screen border"
+msgstr "ربودن پنجره به کنار صفحه"
+
+#: mcs-plugin/xfwm4_plugin.c:1548
+msgid "Snap windows to other windows"
+msgstr "ربودن پنجره‌ها به پنجره‌های دیگر"
+
+#: mcs-plugin/xfwm4_plugin.c:1561
+msgid "Distance :"
+msgstr "مصافت :"
+
+#: mcs-plugin/xfwm4_plugin.c:1569 mcs-plugin/xfwm4_plugin.c:1638
+msgid "Small"
+msgstr "Ú©ÙˆÚ†Ú©"
+
+#: mcs-plugin/xfwm4_plugin.c:1577 mcs-plugin/xfwm4_plugin.c:1646
+msgid "Wide"
+msgstr "پهن"
+
+#: mcs-plugin/xfwm4_plugin.c:1600
+msgid "Wrap workspaces"
+msgstr "پیچیدن فضاهای کاری"
+
+#: mcs-plugin/xfwm4_plugin.c:1609
+msgid "Wrap workspaces when the pointer reaches a screen edge"
+msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
+
+#: mcs-plugin/xfwm4_plugin.c:1618
+msgid "Wrap workspaces when dragging a window off the screen"
+msgstr "پیچیدن فضاهای کاری وقتی که پنجره‌ای به خارج از صفحه کشیده شود"
+
+#: mcs-plugin/xfwm4_plugin.c:1630
+msgid "Edge Resistance :"
+msgstr "مقاومت لبه :"
+
+#: mcs-plugin/xfwm4_plugin.c:1671
+msgid "Opaque move and resize"
+msgstr "حرکت دادن آهسته و تغییر اندازه"
+
+#: mcs-plugin/xfwm4_plugin.c:1680
+msgid "Display content of windows when resizing"
+msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
+
+#: mcs-plugin/xfwm4_plugin.c:1688
+msgid "Display content of windows when moving"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+
+#: mcs-plugin/xfwm4_plugin.c:1695
+msgid "Double click action"
+msgstr "عمل دوکلیکه"
+
+#: mcs-plugin/xfwm4_plugin.c:1701
+msgid "Action to perform when double clicking on title bar :"
+msgstr "عملی که هنگام دوکلیکه کردن بر نوار عنوان انجام می‌گردد :"
+
+#: mcs-plugin/xfwm4_plugin.c:1706
+msgid "Advanced"
+msgstr "پیشرفته"
+
+#: src/client.c:508
+#, c-format
+msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
+msgstr "%s: net_wm_state (window 0x%lx) سازماندهی نشده"
+
+#: src/events.c:1497
+#, c-format
+msgid "%s: Operation not supported (yet)\n"
+msgstr "%s: عملیات (هنوز) پشتیبانی ندارد\n"
+
+#: src/main.c:228
+#, c-format
+msgid "%s: Segmentation fault"
+msgstr "%s: نقص در قطعه‌بندی"
+
+#: src/main.c:402
+#, c-format
+msgid "%s: Another Window Manager is already running"
+msgstr "%s: مدیر پنجره‌ی دیگری از قبل در حال اجرا است"
+
+#: src/main.c:407
+#, c-format
+msgid "%s: Missing data from default files"
+msgstr "%s: فقدان داده‌ها از پرونده‌های پیش‌فرض"
+
+#: src/main.c:416
+#, c-format
+msgid "%s: Failed to enter daemon mode: %s"
+msgstr "%s: موفق به وارد شدن به حالت شبح نشد: %s"
+
+#: src/main.c:424
+#, c-format
+msgid "%s: Failed to create new process: %s"
+msgstr "%s: ناموفق در ایجاد پردازش جدید: %s"
+
+#: src/main.c:445
+#, c-format
+msgid "%s: Unknown error occured"
+msgstr "%s: خطای ناشناسی رخ داد"
+
+#: src/menu.c:42
+msgid "Ma_ximize"
+msgstr "بزـرگ‌سازی"
+
+#: src/menu.c:43
+msgid "Un_maximize"
+msgstr "بزرـگ‌نسازی"
+
+#: src/menu.c:44
+msgid "_Hide"
+msgstr "ـپنهان کردن"
+
+#: src/menu.c:45
+msgid "Hide _all others"
+msgstr "پنهان کردن بـقیه"
+
+#: src/menu.c:46
+msgid "S_how"
+msgstr "نـشان دادن"
+
+#: src/menu.c:47
+msgid "_Shade"
+msgstr "ـسایه‌زدن"
+
+#: src/menu.c:48
+msgid "Un_shade"
+msgstr "سایه‌ـنزدن"
+
+#: src/menu.c:49
+msgid "S_tick"
+msgstr "ـچسباندن"
+
+#: src/menu.c:50
+msgid "Uns_tick"
+msgstr "ـنچسباندن"
+
+#: src/menu.c:51
+msgid "Context _help"
+msgstr "راـهنمای زمینه"
+
+#: src/menu.c:52 src/menu.c:53
+msgid "Always on top"
+msgstr "همیشه در بالا"
+
+#: src/menu.c:54
+msgid "Send to..."
+msgstr "فرستادن به..."
+
+#: src/menu.c:56
+msgid "_Close"
+msgstr "ـبستن"
+
+#: src/menu.c:59
+msgid "Destroy"
+msgstr "تخریب"
+
+#: src/menu.c:62
+msgid "_Quit"
+msgstr "ـترک"
+
+#: src/menu.c:63
+msgid "Restart"
+msgstr "راه‌اندازی مجدد"
+
+#: src/menu.c:166
+#, c-format
+msgid "Workspace %i"
+msgstr "فضای کاری %i"
+
+#: src/menu.c:408
+#, c-format
+msgid "%s: GtkMenu failed to grab the pointer\n"
+msgstr "%s: GtkMenu موفق به گرفتن اشاره‌گر نشد\n"
+
+#: src/settings.c:315
+#, c-format
+msgid "%s: Missing defaults file"
+msgstr "%s: فقدان پرونده‌ی پیش‌فرض‌ها"
+
+#: src/settings.c:553
+#, c-format
+msgid "%s: Cannot allocate active color %s\n"
+msgstr "%s: نمی‌توان رنگ فعال %s را جایابی کرد\n"
+
+#: src/settings.c:560
+#, c-format
+msgid "%s: Cannot parse active color %s\n"
+msgstr "%s: نمی‌توان رنگ فعال %s را تجزیه کرد\n"
+
+#: src/settings.c:604
+#, c-format
+msgid "%s: Cannot allocate inactive color %s\n"
+msgstr "%s: نمی‌توان رنگ غیرفعال %s را جایابی کرد\n"
+
+#: src/settings.c:611
+#, c-format
+msgid "%s: Cannot parse inactive color %s\n"
+msgstr "%s: نمی‌توان رنگ غیرفعال %s را تجزیه کرد\n"
+
+#: src/settings.c:798
+#, c-format
+msgid "%s: specified key theme \"%s\" missing, using default"
+msgstr "%s: طرح کلید مشخص شده‌ی \"%s\" وجود ندارد، از پیش‌فرض استفاده می‌شود"
+
+#: src/settings.c:808
+#, c-format
+msgid "%s: Missing values in defaults file"
+msgstr "%s: فقدان مقادیر در پرونده‌ی پیش‌فرض‌ها"
+
+#: src/settings.c:1155
+#, c-format
+msgid "%s: Workspace count not set, using rc value: %i"
+msgstr "%s: شمارش فضای کاری گذاشته نشده، استفاده از مقدار rc: %i"
+
+#: src/tabwin.c:70
+msgid "Switch to ..."
+msgstr "تعویض به ..."
+
diff --git a/po/ja.gmo b/po/ja.gmo
index e33222b33f35324cb6d4e8343c0afb4b98041341..a609081be2547205d40cc6787fc7654bb47b0855 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index cfcef8d842880c33a9d029f8e1fe8b21c7597831..5f5a7848227f6a69c5dff64280c3713159129c81 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,83 +6,46 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2004-01-03 22:16+0100\n"
-"PO-Revision-Date: 2003-05-27 22:00+0900\n"
+"POT-Creation-Date: 2003-09-22 21:23+0200\n"
+"PO-Revision-Date: 2003-12-10 14:20+0900\n"
 "Last-Translator: Zhao Ji <zhao-ji@awz.ne.jp>\n"
-"Language-Team: none <none@none>\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:124
+#: mcs-plugin/margins_plugin.c:133 mcs-plugin/margins_plugin.c:235
+#: mcs-plugin/margins_plugin.c:254
+msgid "Workspace Margins"
+msgstr "ワークスペース・マージン"
+
+#: mcs-plugin/margins_plugin.c:217
+msgid "Adjust workspace margins"
+msgstr "ワークスペース・マージン調整"
+
+#: mcs-plugin/margins_plugin.c:241
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
+"ウィンドウが置かれない場合、マージンはスクリーン端のエリアです。"
 
-#: mcs-plugin/margins.c:131
-msgid "Workspace Margins"
-msgstr "ワークスペース・マージン"
-
-#: mcs-plugin/margins.c:159
+#: mcs-plugin/margins_plugin.c:281
 msgid "Left :"
 msgstr "å·¦ :"
 
-#: mcs-plugin/margins.c:179
+#: mcs-plugin/margins_plugin.c:301
 msgid "Right :"
 msgstr "右 :"
 
-#: mcs-plugin/margins.c:199
+#: mcs-plugin/margins_plugin.c:321
 msgid "Top :"
 msgstr "上 :"
 
-#: mcs-plugin/margins.c:219
+#: mcs-plugin/margins_plugin.c:341
 msgid "Bottom :"
 msgstr "下 :"
 
-#: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
-#, fuzzy
-msgid "Workspaces and Margins"
-msgstr "ワークスペース・マージン"
-
-#. Number of workspaces
-#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
-#, fuzzy
-msgid "Workspaces"
-msgstr "ワークスペース %i"
-
-#: mcs-plugin/plugin.c:179
-msgid "Margins"
-msgstr ""
-
-#: mcs-plugin/workspaces.c:337
-msgid "Change name"
-msgstr ""
-
-#: mcs-plugin/workspaces.c:349
-#, fuzzy, c-format
-msgid "Workspace %d"
-msgstr "ワークスペース %i"
-
-#: mcs-plugin/workspaces.c:359
-msgid "Name:"
-msgstr ""
-
-#: mcs-plugin/workspaces.c:447
-msgid "Click on a workspace name to edit it"
-msgstr ""
-
-#: mcs-plugin/workspaces.c:519
-#, fuzzy
-msgid "Number of workspaces:"
-msgstr "ワークスペース循環"
-
-#. Workspace names
-#: mcs-plugin/workspaces.c:550
-#, fuzzy
-msgid "Workspace names"
-msgstr "ワークスペース・マージン"
-
 #: mcs-plugin/xfwm4_plugin.c:116
 msgid "Title"
 msgstr "タイトル"
@@ -306,14 +269,14 @@ msgstr "タイトルバーをダブルクリックした時の動作 :"
 
 #: mcs-plugin/xfwm4_plugin.c:1706
 msgid "Advanced"
-msgstr ""
+msgstr "上級"
 
-#: src/client.c:508
+#: src/client.c:496
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
-msgstr ""
+msgstr "%s: net_wm_state が未管理です (window 0x%lx)"
 
-#: src/events.c:1490
+#: src/events.c:1453
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: この操作はサポート外です\n"
@@ -333,17 +296,7 @@ msgstr "%s: 別のウィンドウ・マネージャが実行中"
 msgid "%s: Missing data from default files"
 msgstr "%s: 標準ファイルにデータが見付かりません"
 
-#: src/main.c:413
-#, c-format
-msgid "%s: Failed to enter daemon mode: %s"
-msgstr ""
-
-#: src/main.c:421
-#, c-format
-msgid "%s: Failed to create new process: %s"
-msgstr ""
-
-#: src/main.c:442
+#: src/main.c:431
 #, c-format
 msgid "%s: Unknown error occured"
 msgstr "%s: 未知のエラーが発生"
@@ -385,89 +338,78 @@ msgid "Uns_tick"
 msgstr "はがす(_t)"
 
 #: src/menu.c:51
-msgid "Context _help"
-msgstr ""
-
-#: src/menu.c:52 src/menu.c:53
-msgid "Always on top"
-msgstr ""
-
-#: src/menu.c:54
 msgid "Send to..."
 msgstr "送る..."
 
-#: src/menu.c:56
+#: src/menu.c:53
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: src/menu.c:59
+#: src/menu.c:56
 msgid "Destroy"
 msgstr "殺す"
 
-#: src/menu.c:62
+#: src/menu.c:59
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/menu.c:63
+#: src/menu.c:60
 msgid "Restart"
 msgstr "再起動"
 
-#: src/menu.c:166
+#: src/menu.c:163
 #, c-format
 msgid "Workspace %i"
 msgstr "ワークスペース %i"
 
-#: src/menu.c:408
+#: src/menu.c:405
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenuはポインターを取得できませんでした\n"
 
-#: src/settings.c:315
+#: src/settings.c:285
 #, c-format
 msgid "%s: Missing defaults file"
 msgstr "%s: 標準ファイルが、みつかりません"
 
-#: src/settings.c:553
+#: src/settings.c:510
 #, c-format
 msgid "%s: Cannot allocate active color %s\n"
 msgstr "%s: アクティブ・カラーを割り当てできません %s\n"
 
-#: src/settings.c:560
+#: src/settings.c:517
 #, c-format
 msgid "%s: Cannot parse active color %s\n"
 msgstr "%s: アクティブ・カラーが解析できません %s\n"
 
-#: src/settings.c:604
+#: src/settings.c:561
 #, c-format
 msgid "%s: Cannot allocate inactive color %s\n"
 msgstr "%s: 非アクティブ・カラーを割り当てできません %s\n"
 
-#: src/settings.c:611
+#: src/settings.c:568
 #, c-format
 msgid "%s: Cannot parse inactive color %s\n"
 msgstr "%s: 非アクティブ・カラーが解析できません %s\n"
 
-#: src/settings.c:798
+#: src/settings.c:755
 #, c-format
 msgid "%s: specified key theme \"%s\" missing, using default"
-msgstr ""
+msgstr "%s: 指定されたキー・テーマ \"%s\" が見当たりません, 標準を使います"
 
-#: src/settings.c:808
+#: src/settings.c:765
 #, c-format
 msgid "%s: Missing values in defaults file"
 msgstr "%s: 標準ファイルに値が見付かりません"
 
-#: src/settings.c:1155
+#: src/settings.c:1106
 #, c-format
 msgid "%s: Workspace count not set, using rc value: %i"
-msgstr ""
+msgstr "%s: ワークスペース数 未設定, rcの値を使用: %i"
 
 #: src/tabwin.c:70
 msgid "Switch to ..."
-msgstr ""
-
-#~ msgid "Adjust workspace margins"
-#~ msgstr "ワークスペース・マージン調整"
+msgstr "切替え..."
 
 #~ msgid "Window style"
 #~ msgstr "ウィンドウ・スタイル"
diff --git a/po/ko.gmo b/po/ko.gmo
index 728877d88614ea1c96f6c136da31bda3dd8d38b2..997f79376882987e9329d69cf216abe2424261cf 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index ff7bab2a717fcee2b092b497d8cf4b3a7a1602cf..09da0a88f32e174165e30a8225ed96de574d77ff 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -55,11 +55,11 @@ msgstr "작업공간 %i"
 
 #: mcs-plugin/plugin.c:179
 msgid "Margins"
-msgstr ""
+msgstr "여백"
 
 #: mcs-plugin/workspaces.c:337
 msgid "Change name"
-msgstr ""
+msgstr "이름 변경"
 
 #: mcs-plugin/workspaces.c:349
 #, fuzzy, c-format
@@ -68,15 +68,15 @@ msgstr "작업공간 %i"
 
 #: mcs-plugin/workspaces.c:359
 msgid "Name:"
-msgstr ""
+msgstr "이름:"
 
 #: mcs-plugin/workspaces.c:447
 msgid "Click on a workspace name to edit it"
-msgstr ""
+msgstr "작업공간의 이름을 클릭하면 이름을 변경할 수 있습니다."
 
 #: mcs-plugin/workspaces.c:519
 msgid "Number of workspaces:"
-msgstr ""
+msgstr "작업공간의 수:"
 
 #. Workspace names
 #: mcs-plugin/workspaces.c:550
@@ -241,15 +241,15 @@ msgstr "단축키 및 창 활성"
 
 #: mcs-plugin/xfwm4_plugin.c:1530
 msgid "Windows snapping"
-msgstr ""
+msgstr "창 움직임"
 
 #: mcs-plugin/xfwm4_plugin.c:1539
 msgid "Snap windows to screen border"
-msgstr ""
+msgstr "화면 경계에 따라 움직임"
 
 #: mcs-plugin/xfwm4_plugin.c:1548
 msgid "Snap windows to other windows"
-msgstr ""
+msgstr "다른 창에 맞추어 움직임"
 
 #: mcs-plugin/xfwm4_plugin.c:1561
 msgid "Distance :"
@@ -265,19 +265,19 @@ msgstr "넓게"
 
 #: mcs-plugin/xfwm4_plugin.c:1600
 msgid "Wrap workspaces"
-msgstr ""
+msgstr "작업 공간 전환"
 
 #: mcs-plugin/xfwm4_plugin.c:1609
 msgid "Wrap workspaces when the pointer reaches a screen edge"
-msgstr ""
+msgstr "마우스 포인터가 화면 모서리에 닿으면 작업공간 전환"
 
 #: mcs-plugin/xfwm4_plugin.c:1618
 msgid "Wrap workspaces when dragging a window off the screen"
-msgstr ""
+msgstr "창을 화면 밖으로 이동시키면 작업공간 전환"
 
 #: mcs-plugin/xfwm4_plugin.c:1630
 msgid "Edge Resistance :"
-msgstr ""
+msgstr "화면 모서리 저항 :"
 
 #: mcs-plugin/xfwm4_plugin.c:1671
 msgid "Opaque move and resize"
@@ -381,11 +381,11 @@ msgstr "현재 작업공간에 보이기(_t)"
 
 #: src/menu.c:51
 msgid "Context _help"
-msgstr ""
+msgstr "도움말(_h)"
 
 #: src/menu.c:52 src/menu.c:53
 msgid "Always on top"
-msgstr ""
+msgstr "항상 위"
 
 #: src/menu.c:54
 msgid "Send to..."
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..ab43adcdfdd08329a104597e192f802d6e30f676
Binary files /dev/null and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000000000000000000000000000000000000..5d28609ca70aa03127aa3d2ad18e9b5d958ebac1
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,460 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: xfwm4\n"
+"POT-Creation-Date: 2003-12-21 22:35+0100\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"
+
+#: mcs-plugin/margins.c:124
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr "Margens são áreas no canto da tela onde nenhuma janela será colocada"
+
+#: mcs-plugin/margins.c:131
+msgid "Workspace Margins"
+msgstr "Margens da área de trabalho"
+
+#: mcs-plugin/margins.c:159
+msgid "Left :"
+msgstr "Esquerdo :"
+
+#: mcs-plugin/margins.c:179
+msgid "Right :"
+msgstr "Direito :"
+
+#: mcs-plugin/margins.c:199
+msgid "Top :"
+msgstr "Topo :"
+
+#: mcs-plugin/margins.c:219
+msgid "Bottom :"
+msgstr "Abaixo :"
+
+#: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
+msgid "Workspaces and Margins"
+msgstr "Área de trabalho e margens"
+
+#. Number of workspaces
+#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
+msgid "Workspaces"
+msgstr "Áreas de trabalho"
+
+#: mcs-plugin/plugin.c:179
+msgid "Margins"
+msgstr "Margens"
+
+#: mcs-plugin/workspaces.c:337
+msgid "Change name"
+msgstr "Mudar nome"
+
+#: mcs-plugin/workspaces.c:349
+#, c-format
+msgid "Workspace %d"
+msgstr "Área de trabalho %d"
+
+#: mcs-plugin/workspaces.c:359
+msgid "Name:"
+msgstr "Nome:"
+
+#: mcs-plugin/workspaces.c:447
+msgid "Click on a workspace name to edit it"
+msgstr "Clique no nome da área de trabalho para editá-la"
+
+#: mcs-plugin/workspaces.c:519
+msgid "Number of workspaces:"
+msgstr "Número de áreas de trabalho:"
+
+#. Workspace names
+#: mcs-plugin/workspaces.c:550
+msgid "Workspace names"
+msgstr "Nome da área de trabalho"
+
+#: mcs-plugin/xfwm4_plugin.c:116
+msgid "Title"
+msgstr "Título"
+
+#: mcs-plugin/xfwm4_plugin.c:117
+msgid "Menu"
+msgstr "Menu"
+
+#: mcs-plugin/xfwm4_plugin.c:118
+msgid "Stick"
+msgstr "Fixar"
+
+#: mcs-plugin/xfwm4_plugin.c:119
+msgid "Shade"
+msgstr "Sombra"
+
+#: mcs-plugin/xfwm4_plugin.c:120
+msgid "Hide"
+msgstr "Esconder"
+
+#: mcs-plugin/xfwm4_plugin.c:121
+msgid "Maximize"
+msgstr "Maximizar"
+
+#: mcs-plugin/xfwm4_plugin.c:122
+msgid "Close"
+msgstr "Fechar"
+
+#: mcs-plugin/xfwm4_plugin.c:126
+msgid "Shade window"
+msgstr "Sombrear janela"
+
+#: mcs-plugin/xfwm4_plugin.c:127
+msgid "Hide window"
+msgstr "Esconder janela"
+
+#: mcs-plugin/xfwm4_plugin.c:128
+msgid "Maximize window"
+msgstr "Maximizar janela"
+
+#: mcs-plugin/xfwm4_plugin.c:129
+msgid "Nothing"
+msgstr "Nada"
+
+#: mcs-plugin/xfwm4_plugin.c:134
+msgid "Left"
+msgstr "Esquerdo"
+
+#: mcs-plugin/xfwm4_plugin.c:135
+msgid "Center"
+msgstr "Centro"
+
+#: mcs-plugin/xfwm4_plugin.c:136
+msgid "Right"
+msgstr "Direito"
+
+#: mcs-plugin/xfwm4_plugin.c:436
+msgid "Hidden"
+msgstr "Oculto"
+
+#: mcs-plugin/xfwm4_plugin.c:1206
+msgid "Font Selection Dialog"
+msgstr "Diálogo de seleção de fontes"
+
+#: mcs-plugin/xfwm4_plugin.c:1274 mcs-plugin/xfwm4_plugin.c:1845
+msgid "Window Manager"
+msgstr "Gerenciador de janelas"
+
+#: mcs-plugin/xfwm4_plugin.c:1288
+msgid "Window Manager Preferences"
+msgstr "Preferências do gerenciador de janelas"
+
+#: mcs-plugin/xfwm4_plugin.c:1325
+msgid "Title font"
+msgstr "Fonte do título"
+
+#: mcs-plugin/xfwm4_plugin.c:1338
+msgid "Title Alignment"
+msgstr "Alinhamento do título"
+
+#. XXX
+#: mcs-plugin/xfwm4_plugin.c:1344
+msgid "Text alignment inside title bar :"
+msgstr "Alinhamento do texto dentro da barra de títulos :"
+
+#: mcs-plugin/xfwm4_plugin.c:1349
+msgid "Button layout"
+msgstr "Disposição dos botôes"
+
+#: mcs-plugin/xfwm4_plugin.c:1356
+msgid "Decoration style"
+msgstr "Estilo de decoração"
+
+#: mcs-plugin/xfwm4_plugin.c:1369
+msgid "Keyboard Shortcut"
+msgstr "Teclas de atalho"
+
+#: mcs-plugin/xfwm4_plugin.c:1393
+msgid "Focus model"
+msgstr "Modelo de foco"
+
+#: mcs-plugin/xfwm4_plugin.c:1402
+msgid "Click to focus"
+msgstr "Foco ao clicar"
+
+#: mcs-plugin/xfwm4_plugin.c:1416
+msgid "Focus follows mouse"
+msgstr "Foco segue o mouse"
+
+#: mcs-plugin/xfwm4_plugin.c:1430
+msgid "New window focus"
+msgstr "Foco em novas janelas"
+
+#: mcs-plugin/xfwm4_plugin.c:1435
+msgid ""
+"Automatically give focus to \n"
+"newly created windows"
+msgstr ""
+"Aututomaticamente dê foco \n"
+"em novas janelas criadas"
+
+#: mcs-plugin/xfwm4_plugin.c:1442
+msgid "Raise on focus"
+msgstr "Foco ao aumentar"
+
+#: mcs-plugin/xfwm4_plugin.c:1451
+msgid ""
+"Automatically raise windows \n"
+"when they receive focus"
+msgstr ""
+"Automaticamente aumente a janela \n"
+"quando elas receberem foco"
+
+#: mcs-plugin/xfwm4_plugin.c:1464
+msgid "Delay before raising focused window :"
+msgstr "Atraso antes de aumentar janelas com foco :"
+
+#: mcs-plugin/xfwm4_plugin.c:1472
+msgid "Slow"
+msgstr "Lento"
+
+#: mcs-plugin/xfwm4_plugin.c:1480
+msgid "Fast"
+msgstr "Rápido"
+
+#: mcs-plugin/xfwm4_plugin.c:1504
+msgid "Raise on click"
+msgstr "Aumentar ao clique"
+
+#: mcs-plugin/xfwm4_plugin.c:1509
+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_plugin.c:1517
+msgid "Keyboard and focus"
+msgstr "Teclado e foco"
+
+#: mcs-plugin/xfwm4_plugin.c:1530
+msgid "Windows snapping"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin.c:1539
+msgid "Snap windows to screen border"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin.c:1548
+msgid "Snap windows to other windows"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin.c:1561
+msgid "Distance :"
+msgstr "Distância :"
+
+#: mcs-plugin/xfwm4_plugin.c:1569 mcs-plugin/xfwm4_plugin.c:1638
+msgid "Small"
+msgstr "Pequeno"
+
+#: mcs-plugin/xfwm4_plugin.c:1577 mcs-plugin/xfwm4_plugin.c:1646
+msgid "Wide"
+msgstr "Largo"
+
+#: mcs-plugin/xfwm4_plugin.c:1600
+#, fuzzy
+msgid "Wrap workspaces"
+msgstr "Mudar de área de tranbalho"
+
+#: mcs-plugin/xfwm4_plugin.c:1609
+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:1618
+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:1630
+msgid "Edge Resistance :"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin.c:1671
+msgid "Opaque move and resize"
+msgstr ""
+
+#: mcs-plugin/xfwm4_plugin.c:1680
+msgid "Display content of windows when resizing"
+msgstr "Mostrar conteúdo das janelas ao dimensionar"
+
+#: mcs-plugin/xfwm4_plugin.c:1688
+msgid "Display content of windows when moving"
+msgstr "Mostrar conteúdo das janelas ao mover"
+
+#: mcs-plugin/xfwm4_plugin.c:1695
+msgid "Double click action"
+msgstr "Ação do duplo clique"
+
+#: mcs-plugin/xfwm4_plugin.c:1701
+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:1706
+msgid "Advanced"
+msgstr "Avançado"
+
+#: src/client.c:508
+#, c-format
+msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
+msgstr ""
+
+#: src/events.c:1490
+#, c-format
+msgid "%s: Operation not supported (yet)\n"
+msgstr "%s: Operação não permitida (ainda)\n"
+
+#: src/main.c:228
+#, c-format
+msgid "%s: Segmentation fault"
+msgstr "%s: Falha de segmentação"
+
+#: src/main.c:399
+#, c-format
+msgid "%s: Another Window Manager is already running"
+msgstr "%s: Outro gerenciador de janelas já esta executando"
+
+#: src/main.c:404
+#, c-format
+msgid "%s: Missing data from default files"
+msgstr "%s: Perda de informações dos arquivos padrões"
+
+#: src/main.c:413
+#, c-format
+msgid "%s: Failed to enter daemon mode: %s"
+msgstr ""
+
+#: src/main.c:421
+#, c-format
+msgid "%s: Failed to create new process: %s"
+msgstr "%s: Falha ao criar novo processo: %s"
+
+#: src/main.c:442
+#, c-format
+msgid "%s: Unknown error occured"
+msgstr "%s: Ocorreu um erro desconhecido"
+
+#: src/menu.c:42
+msgid "Ma_ximize"
+msgstr "Ma_ximizar"
+
+#: src/menu.c:43
+msgid "Un_maximize"
+msgstr "Mi_nimizar"
+
+#: src/menu.c:44
+msgid "_Hide"
+msgstr "_Ocultar"
+
+#: src/menu.c:45
+msgid "Hide _all others"
+msgstr "Ocultar _todos os outros"
+
+#: src/menu.c:46
+msgid "S_how"
+msgstr "M_ostrar"
+
+#: src/menu.c:47
+msgid "_Shade"
+msgstr "_Sombrear"
+
+#: src/menu.c:48
+msgid "Un_shade"
+msgstr "Des_sombrear"
+
+#: src/menu.c:49
+msgid "S_tick"
+msgstr ""
+
+#: src/menu.c:50
+msgid "Uns_tick"
+msgstr ""
+
+#: src/menu.c:51 src/menu.c:52
+msgid "Always on top"
+msgstr "Sempre no topo"
+
+#: src/menu.c:53
+msgid "Send to..."
+msgstr "enviar para..."
+
+#: src/menu.c:55
+msgid "_Close"
+msgstr "_Fechar"
+
+#: src/menu.c:58
+msgid "Destroy"
+msgstr "Destruir"
+
+#: src/menu.c:61
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/menu.c:62
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: src/menu.c:165
+#, c-format
+msgid "Workspace %i"
+msgstr "Área de trabalho %i"
+
+#: src/menu.c:407
+#, c-format
+msgid "%s: GtkMenu failed to grab the pointer\n"
+msgstr "%s: GtkMenu falhou para encontrar o mouse\n"
+
+#: src/settings.c:315
+#, c-format
+msgid "%s: Missing defaults file"
+msgstr "%s: Falta arquivos padrões"
+
+#: src/settings.c:553
+#, c-format
+msgid "%s: Cannot allocate active color %s\n"
+msgstr ""
+
+#: src/settings.c:560
+#, c-format
+msgid "%s: Cannot parse active color %s\n"
+msgstr ""
+
+#: src/settings.c:604
+#, c-format
+msgid "%s: Cannot allocate inactive color %s\n"
+msgstr ""
+
+#: src/settings.c:611
+#, c-format
+msgid "%s: Cannot parse inactive color %s\n"
+msgstr ""
+
+#: src/settings.c:798
+#, c-format
+msgid "%s: specified key theme \"%s\" missing, using default"
+msgstr ""
+
+#: src/settings.c:808
+#, c-format
+msgid "%s: Missing values in defaults file"
+msgstr ""
+
+#: src/settings.c:1155
+#, c-format
+msgid "%s: Workspace count not set, using rc value: %i"
+msgstr ""
+
+#: src/tabwin.c:70
+msgid "Switch to ..."
+msgstr "Mudar para ..."
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 871b0ee3e6e9bbd9a192f734f6f649c3d60b9e93..ce97ec4491bf24e851092c5d777d29ed300bdb11 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 e85c8976c4dfb61b400edbca44333a7e36ea764d..510c11a5d57eed52f5fa50d3209b7055bd7a821f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -41,47 +41,44 @@ msgid "Bottom :"
 msgstr "底部:"
 
 #: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
-#, fuzzy
 msgid "Workspaces and Margins"
 msgstr "工作区边缘"
 
 #. Number of workspaces
 #: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
-#, fuzzy
 msgid "Workspaces"
-msgstr "工作区 %i"
+msgstr "工作区"
 
 #: mcs-plugin/plugin.c:179
 msgid "Margins"
-msgstr ""
+msgstr "边缘"
 
 #: mcs-plugin/workspaces.c:337
 msgid "Change name"
-msgstr ""
+msgstr "改变名称"
 
 #: mcs-plugin/workspaces.c:349
-#, fuzzy, c-format
+#, c-format
 msgid "Workspace %d"
 msgstr "工作区 %i"
 
 #: mcs-plugin/workspaces.c:359
 msgid "Name:"
-msgstr ""
+msgstr "名称: "
 
 #: mcs-plugin/workspaces.c:447
 msgid "Click on a workspace name to edit it"
-msgstr ""
+msgstr "点击一个工作区的名称来编辑它"
 
 #: mcs-plugin/workspaces.c:519
-#, fuzzy
 msgid "Number of workspaces:"
-msgstr "回绕工作区"
+msgstr "工作区名称: "
+
 
 #. Workspace names
 #: mcs-plugin/workspaces.c:550
-#, fuzzy
 msgid "Workspace names"
-msgstr "工作区边缘"
+msgstr "工作区个数"
 
 #: mcs-plugin/xfwm4_plugin.c:116
 msgid "Title"
@@ -309,7 +306,7 @@ msgid "Advanced"
 msgstr "高级"
 
 #: src/client.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: 无法管理的net_wm_state  (window %%lx)"
 
@@ -336,12 +333,12 @@ msgstr "%s: 默认文件中缺少数据"
 #: src/main.c:413
 #, c-format
 msgid "%s: Failed to enter daemon mode: %s"
-msgstr ""
+msgstr "%s: 无法进入守护进程模式: %s"
 
 #: src/main.c:421
 #, c-format
 msgid "%s: Failed to create new process: %s"
-msgstr ""
+msgstr "%s: 无法创建新进程: %s"
 
 #: src/main.c:442
 #, c-format
@@ -386,11 +383,11 @@ msgstr "分离(_T)"
 
 #: src/menu.c:51
 msgid "Context _help"
-msgstr ""
+msgstr "上下文帮助(_H)"
 
 #: src/menu.c:52 src/menu.c:53
 msgid "Always on top"
-msgstr ""
+msgstr "总是置顶"
 
 #: src/menu.c:54
 msgid "Send to..."