[Xfce4-commits] <xfwm4:master> Rebuild po files.

Nick Schermer noreply at xfce.org
Sat Apr 7 20:00:05 CEST 2012


Updating branch refs/heads/master
         to 2fb7e94506a3317403ae5308326f3d1734fa907e (commit)
       from f6cf2059575ac12cbad99318952842fd0c2c576a (commit)

commit 2fb7e94506a3317403ae5308326f3d1734fa907e
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 7 19:58:57 2012 +0200

    Rebuild po files.

 po/am.po    |  567 +++++++++++++++++++++++++++--------------------------
 po/ar.po    |  542 ++++++++++++++++++++++++++-------------------------
 po/ast.po   |  553 +++++++++++++++++++++++++++-------------------------
 po/az.po    |  531 ++++++++++++++++++++++++++------------------------
 po/be.po    |  577 ++++++++++++++++++++++++++++---------------------------
 po/bg.po    |  538 ++++++++++++++++++++++++++-------------------------
 po/bn.po    |  535 ++++++++++++++++++++++++++-------------------------
 po/bn_IN.po |  527 +++++++++++++++++++++++++------------------------
 po/ca.po    |  553 +++++++++++++++++++++++++++-------------------------
 po/cs.po    |  550 +++++++++++++++++++++++++++-------------------------
 po/da.po    |  533 ++++++++++++++++++++++++++------------------------
 po/de.po    |  566 ++++++++++++++++++++++++++++-------------------------
 po/dz.po    |  571 +++++++++++++++++++++++++++--------------------------
 po/el.po    |  551 +++++++++++++++++++++++++++-------------------------
 po/en_GB.po |  543 ++++++++++++++++++++++++++-------------------------
 po/eo.po    |  577 ++++++++++++++++++++++++++++---------------------------
 po/es.po    |  551 +++++++++++++++++++++++++++-------------------------
 po/es_MX.po |  535 ++++++++++++++++++++++++++-------------------------
 po/et.po    |  573 +++++++++++++++++++++++++++--------------------------
 po/eu.po    |  541 ++++++++++++++++++++++++++-------------------------
 po/fa.po    |  531 ++++++++++++++++++++++++++------------------------
 po/fi.po    |  527 +++++++++++++++++++++++++------------------------
 po/fr.po    |  553 +++++++++++++++++++++++++++-------------------------
 po/gl.po    |  549 ++++++++++++++++++++++++++-------------------------
 po/gu.po    |  533 ++++++++++++++++++++++++++-------------------------
 po/he.po    |  573 ++++++++++++++++++++++++++++--------------------------
 po/hi.po    |  550 +++++++++++++++++++++++++++-------------------------
 po/hr.po    |  490 ++++++++++++++++++++++++----------------------
 po/hu.po    |  535 ++++++++++++++++++++++++++-------------------------
 po/id.po    |  541 ++++++++++++++++++++++++++-------------------------
 po/is.po    |  418 ++++++++++++++++++++-------------------
 po/it.po    |  535 ++++++++++++++++++++++++++-------------------------
 po/ja.po    |  571 +++++++++++++++++++++++++++--------------------------
 po/ka.po    |  337 ++++++++++++++++----------------
 po/kk.po    |  537 ++++++++++++++++++++++++++-------------------------
 po/ko.po    |  529 ++++++++++++++++++++++++++------------------------
 po/lt.po    |  534 ++++++++++++++++++++++++++------------------------
 po/lv.po    |  553 +++++++++++++++++++++++++++--------------------------
 po/mk.po    |  591 ++++++++++++++++++++++++++++---------------------------
 po/mr.po    |  533 ++++++++++++++++++++++++++-------------------------
 po/ms.po    |  543 ++++++++++++++++++++++++++-------------------------
 po/nb.po    |  533 ++++++++++++++++++++++++++------------------------
 po/nl.po    |  517 ++++++++++++++++++++++++------------------------
 po/nn.po    |  627 +++++++++++++++++++++++++++++++----------------------------
 po/pa.po    |  571 +++++++++++++++++++++++++++--------------------------
 po/pl.po    |  538 ++++++++++++++++++++++++++-------------------------
 po/pt.po    |  546 +++++++++++++++++++++++++++-------------------------
 po/pt_BR.po |  537 ++++++++++++++++++++++++++-------------------------
 po/ro.po    |  531 ++++++++++++++++++++++++++------------------------
 po/ru.po    |  550 +++++++++++++++++++++++++++-------------------------
 po/si.po    |  554 +++++++++++++++++++++++++++--------------------------
 po/sk.po    |  539 ++++++++++++++++++++++++++-------------------------
 po/sq.po    |  557 +++++++++++++++++++++++++++--------------------------
 po/sv.po    |  541 ++++++++++++++++++++++++++-------------------------
 po/ta.po    |  538 ++++++++++++++++++++++++++-------------------------
 po/te.po    |  397 +++++++++++++++++++------------------
 po/tr.po    |  527 +++++++++++++++++++++++++------------------------
 po/ug.po    |  569 +++++++++++++++++++++++++++--------------------------
 po/uk.po    |  548 ++++++++++++++++++++++++++-------------------------
 po/ur.po    |  547 ++++++++++++++++++++++++++-------------------------
 po/ur_PK.po |  547 ++++++++++++++++++++++++++-------------------------
 po/vi.po    |  567 +++++++++++++++++++++++++++--------------------------
 po/zh_CN.po |  527 ++++++++++++++++++++++++++------------------------
 po/zh_TW.po |  541 ++++++++++++++++++++++++++-------------------------
 64 files changed, 17693 insertions(+), 16833 deletions(-)

diff --git a/po/am.po b/po/am.po
index 1c36ff2..aa89d76 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2007-07-07 10:35+0100\n"
 "Last-Translator: tegegne tefera <tefera at mekuria.com>\n"
 "Language-Team: Amharic <l10n-am at googlegroups.com>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
 "X-Poedit-Bookmarks: -1,104,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,280 +79,279 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "የመስኮት ድርጊትን ሰርዝ"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "ማስኮት አስተዳዳሪ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "የመስኮት ድርጊትን ሰርዝ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "የመስኮት አስተዳዳሪ ማሰማመር"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "የስራ ቦታ ቁጥሮች፦"
+msgid "Fine-tune window behaviour and effects"
+msgstr "የመስኮት ድርጊትን ሰርዝ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "የስራ ገበታ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "ሲመጠንና ሲንቀሳቀስ ጥቁር ይሁን"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "የአዝራር አጣጣል"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "ሁለቴ መጫን ተግባር"
+msgid "<b>_Theme</b>"
+msgstr "የአርዕስት ስልፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "የማነጣጠር ሞዴል"
+msgid "<b>Title fon_t</b>"
+msgstr "የአርዕስት ፊደል-ቅርጽ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "አዲስ መስኮት ጠቁም"
+msgid "<b>Title _alignment</b>"
+msgstr "የአርዕስት ስልፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "ሲጫን ይነሳ"
+msgid "Click and drag the buttons to change the layout"
+msgstr "ገጽታውን ለመቀየር ጠቁመው ይጎትቱ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "ሲጠቆም ይነሳ"
+msgid "Title"
+msgstr "አርዕስት"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "የአርዕስት ስልፍ"
+msgid "The window title cannot be removed"
+msgstr "የመስኮት አርዕስት፣ ለሰረዝ አይችልም"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "የአርዕስት ፊደል-ቅርጽ"
+msgid "Active"
+msgstr "በስራላይ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "የመስኮት አቋራጭ"
+msgid "Menu"
+msgstr "ምናሌ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "መስኮት ማሰለፍ"
+msgid "Stick"
+msgstr "ሰካ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "የስራ ቦታን እጠፍ"
+msgid "Shade"
+msgstr "ጥላ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "የአርዕስት ስልፍ"
+msgid "Minimize"
+msgstr "አተልቅ _x"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "አተልቅ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "መጠን| ትልቅ"
+msgid "Close"
+msgstr "ዝጋ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "ድብቅ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "ብርሃን አሳላፊ"
+msgid "<b>Button layout</b>"
+msgstr "የአዝራር አጣጣል"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "ሙና"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "መጠን|ትንሽ"
+msgid "<b>Window _shortcuts</b>"
+msgstr "የመስኮት አቋራጭ"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "ርቀት|ሰፊ"
+msgid "Ke_yboard"
+msgstr "ፊደል-ሠሌዳ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "በስራላይ"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "ለመጠቆም ይጫኑ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "ጠለቅ"
+msgid "Focus follows _mouse"
+msgstr "ጠቋሚው አይጥን ይከተላል"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "ኢላማ ሲሰጠው መስኮትን አስነሳ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "አዲስ ለተፈጠረ መስኮት ኢላማን ስጥ"
+msgid "_Delay before window receives focus:"
+msgstr "የተጠቆመ መስኮትን ከምንሳት በፊት ምን ያህል ይዘግይ?፦"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "ለመጠቆም ይጫኑ"
+msgid "<i>Short</i>"
+msgstr "ብርሃን አሳላፊ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "ገጽታውን ለመቀየር ጠቁመው ይጎትቱ"
+msgid "<i>Long</i>"
+msgstr "መጠን| ትልቅ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "ዝጋ"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "የማነጣጠር ሞዴል"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "የተጠቆመ መስኮትን ከምንሳት በፊት ምን ያህል ይዘግይ?፦"
+msgid "Automatically give focus to _newly created windows"
+msgstr "አዲስ ለተፈጠረ መስኮት ኢላማን ስጥ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "ርቀት፦"
+msgid "<b>New window focus</b>"
+msgstr "አዲስ መስኮት ጠቁም"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "ጠቋሚው አይጥን ይከተላል"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "ኢላማ ሲሰጠው መስኮትን አስነሳ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "ድብቅ"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "የተጠቆመ መስኮትን ከምንሳት በፊት ምን ያህል ይዘግይ?፦"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "ሲንቀሳቀስ የመስኮቱ ይዘት ይታይ"
+msgid "<b>Raise on focus</b>"
+msgstr "ሲጠቆም ይነሳ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "ሲመጠን የመስኮቱ ይዘት ይታይ"
+msgid "Raise window when clicking _inside application window"
+msgstr "በፕሮግራሙ መስኮት ውስጥ ሲጠቆም መስኮቱን አስነሳ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "ፊደል-ሠሌዳ"
+msgid "<b>Raise on click</b>"
+msgstr "ሲጫን ይነሳ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "አተልቅ"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "ጠቋሚ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "ምናሌ"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "መስኮትን ከስክሪን ወሰን ጋር ማሰለፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "አተልቅ _x"
+msgid "Snap windows to other _windows"
+msgstr "መስኮቶችን ከለሎች መስኮቶች አሰልፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "በፕሮግራሙ መስኮት ውስጥ ሲጠቆም መስኮቱን አስነሳ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ጥላ"
+msgid "Dis_tance:"
+msgstr "ርቀት፦"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "መስኮቶችን ከለሎች መስኮቶች አሰልፍ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "መስኮትን ከስክሪን ወሰን ጋር ማሰለፍ"
+msgid "<i>Small</i>"
+msgstr "መጠን|ትንሽ"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "ሰካ"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "ርቀት|ሰፊ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "በአርዕስት ማስጫ ላይ ሁለቴ ሲጫን ምን ይገበር?፦"
+msgid "<b>Windows snapping</b>"
+msgstr "መስኮት ማሰለፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "የመስኮት አርዕስት፣ ለሰረዝ አይችልም"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "ጠቋሚው ስክሪን ጠርዝ ሲደርስ የስራ ገበታን እጠፍ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "አርዕስት"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "መስኮትን ከስክሪኑ ወድያ ሲጎተት የስራ ገበታን እጠፍ"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "ጠርዝ ተቃርኖ፦"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "የስራ ቦታን እጠፍ"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "ጠቋሚው ስክሪን ጠርዝ ሲደርስ የስራ ገበታን እጠፍ"
+msgid "Hide content of windows when _resizing"
+msgstr "ሲመጠን የመስኮቱ ይዘት ይታይ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "የተጠቆመ መስኮትን ከምንሳት በፊት ምን ያህል ይዘግይ?፦"
+msgid "Hide content of windows when _moving"
+msgstr "ሲንቀሳቀስ የመስኮቱ ይዘት ይታይ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "ጠርዝ ተቃርኖ፦"
+msgid "<b>Box move and resize</b>"
+msgstr "ሲመጠንና ሲንቀሳቀስ ጥቁር ይሁን"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "ጠቋሚ"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "በአርዕስት ማስጫ ላይ ሁለቴ ሲጫን ምን ይገበር?፦"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "ሁለቴ መጫን ተግባር"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "ሙና"
+msgid "Ad_vanced"
+msgstr "ጠለቅ"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -729,54 +728,55 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "መጠን| ትልቅ"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "የ\"skip pager\" ወይም \"skip taskbar\" ባህሪዎች የተሰየመባቸውን መስኮቶች ዝለል።"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "ብርሃን አጋጅ"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "የተደበቁ (በምልክት ይተተኩ) መኮቶችን ጫምር"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "ብርሃን አሳላፊ"
+msgid "Cycle _through windows on all workspaces"
+msgstr "ሁሉም የስራ ገበታ ላይ ያሉ መስኮቶችን አስስ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "ጥቋሚ መስረቅን ከልክል"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "መዘወር"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "ጥቋሚ መስረቅን ከልክል"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Compositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "የICCCM ጠቋሚ ዘዴን ደረጃ ተጠቀም"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "መዘወር"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "ሁሉም የስራ ገበታ ላይ ያሉ መስኮቶችን አስስ"
+msgid "_Bring window on current workspace"
+msgstr "መስኮቱን ወደሚቀጥለው የስራ ገበታ ውሰድ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Display full screen overlay windows directly"
+msgid "Switch to win_dow's workspace"
+msgstr "መስኮቱን ወደ%d ገበታ ውሰድ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -785,181 +785,188 @@ msgstr "ምንም"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "ሲያድግ የመስኮት ፍሬምን  ደብቅ"
+msgid "Key used to _grab and move windows:"
+msgstr "መስኮቶችን ይዞ መውሰጃ ቁልፍ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "የICCCM ጠቋሚ ዘዴን ደረጃ ተጠቀም"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "የትኛውም የአይጥ ቁልፍ ሲጫን መስኮትን አስነሳ "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "ሲያድግ የመስኮት ፍሬምን  ደብቅ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "መስኮቶችን ይዞ መውሰጃ ቁልፍ"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "ሲወሰድ ቀዳሚ የተለቀ መስኮት መጠንን አድርግ "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ከመስኮት ማሰለፍ ይልቅ ጠርዝ ተቃርኖን ተጠቀም"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "የመስኮቱ ጌጥ ውስጠ-ትይነት"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "በስራ ላይ ያልሆነ መስኮት ውስጠ አሳይነት"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "የፖፕባይ መስኮት ውስጠ አሳይነት"
+msgid "_Accessibility"
+msgstr "ቀለልነት"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "መስኮት ሲንቀሳቀስ ያለው ውስጠ አሳይነት"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "መስኮት ሲመጠን ያለው ውስጠ አሳይነት"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "ሲወሰድ ቀዳሚ የተለቀ መስኮት መጠንን አድርግ "
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr "በፊደል ገበታ አማካይነት ሲቀየር የቀድሞውን የስራ ገበታ አስታውስ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "በፖፕባይ መስኮት ስር ጥላ አሳይ"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "ከገበታው አቀራረብ ላይ በመነሳት የስራ ገበታን እጠፍ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "በመስኮት ስር ጥላ አሳይ"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "የመጀመሪያው ወይም የመጨረሻው የስራ ገበታ ሲደረስ የስራ ገበታን እጠፍ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "በፖፕባይ መስኮት ስር ጥላ አሳይ"
+msgid "_Workspaces"
+msgstr "የስራ ገበታ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "መስኮቱን ወደ%d ገበታ ውሰድ"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Minimum size of windows to trigger smart placement"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ከመስኮት ማሰለፍ ይልቅ ጠርዝ ተቃርኖን ተጠቀም"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "መጠን| ትልቅ"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "ከገበታው አቀራረብ ላይ በመነሳት የስራ ገበታን እጠፍ"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "የመጀመሪያው ወይም የመጨረሻው የስራ ገበታ ሲደረስ የስራ ገበታን እጠፍ"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "ቀለልነት"
+msgid "_Placement"
+msgstr "ቦታ አያያዝ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "መስኮቱን ወደሚቀጥለው የስራ ገበታ ውሰድ"
+msgid "_Enable display compositing"
+msgstr "Enable display compositing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Display full screen overlay windows directly"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr "በመስኮት ስር ጥላ አሳይ"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "በፖፕባይ መስኮት ስር ጥላ አሳይ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "የተደበቁ (በምልክት ይተተኩ) መኮቶችን ጫምር"
+msgid "Show shadows under _dock windows"
+msgstr "በፖፕባይ መስኮት ስር ጥላ አሳይ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Minimum size of windows to trigger smart placement"
+msgid "Opaci_ty of window decorations:"
+msgstr "የመስኮቱ ጌጥ ውስጠ-ትይነት"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "ቦታ አያያዝ"
+msgid "<i>Transparent</i>"
+msgstr "ብርሃን አሳላፊ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "የትኛውም የአይጥ ቁልፍ ሲጫን መስኮትን አስነሳ "
+msgid "<i>Opaque</i>"
+msgstr "ብርሃን አጋጅ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr "በፊደል ገበታ አማካይነት ሲቀየር የቀድሞውን የስራ ገበታ አስታውስ"
+msgid "Opacity of _inactive windows:"
+msgstr "በስራ ላይ ያልሆነ መስኮት ውስጠ አሳይነት"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "መስኮት ሲንቀሳቀስ ያለው ውስጠ አሳይነት"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "የ\"skip pager\" ወይም \"skip taskbar\" ባህሪዎች የተሰየመባቸውን መስኮቶች ዝለል።"
+msgid "Opacity of windows during resi_ze:"
+msgstr "መስኮት ሲመጠን ያለው ውስጠ አሳይነት"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "የፖፕባይ መስኮት ውስጠ አሳይነት"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "የስራ ገበታ"
+msgid "C_ompositor"
+msgstr "Compositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "ድንበሮች"
+msgid "_Number of workspaces:"
+msgstr "የስራ ቦታ ቁጥሮች፦"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "የስራ ቦታን እጠፍ"
+msgid "Names"
+msgstr "ስም፦"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "እንዚህ ድንበሮች ማለት በስክሪኑ ጠርዝ ላይ ያሉ ምንም መስኮት የማይቀመጥባቸው ማለት ነው"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "የስራ ቦታ ቁጥሮች፦"
+msgid "_Margins"
+msgstr "ድንበሮች"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -967,36 +974,36 @@ msgstr "የስራ ቦታ ቁጥሮች፦"
 msgid "%s (on %s)"
 msgstr "%s ( %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "የሸፍሲ 4 የመስኮት አስተዳዳሪ ስየማዎች"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1140,6 +1147,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "የስራ ቦታ ቁጥሮች፦"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "ድንበሮች"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "የስራ ቦታን እጠፍ"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "የስራ ቦታ ስሞች"
 
@@ -1355,10 +1374,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "ስም ቀይር"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "ስም፦"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "ለማረም በስራ ገበታው ላይ ይጠቁሙ "
 
@@ -1376,10 +1391,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "የስራ ቦታና  ድንበር"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "ድንበሮች"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "መስኮት አስተዳዳሪ ስየማዎች"
 
diff --git a/po/ar.po b/po/ar.po
index 37bb30d..0b77899 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@
 # Arabic translations for xfwm4 package.
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
-# 
+#
 # Saleh Alhathal <hathalsal at hotmail.com>, 2004.
 # Mohamed Magdy <alnokta at yahoo.com>, 2006.
 # Mohamed SAAD محمد سعد <metehyi at free.fr>, 2007.
@@ -12,15 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-01-10 23:47-0000\n"
 "Last-Translator: كريم أولاد الشلحة <herr.linux88 at gmail.com>\n"
 "Language-Team: Arabic <herr.linux88 at gmail.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
+"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && "
+"n<=10 ? 2 : 3\n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: Morocco\n"
@@ -91,237 +92,237 @@ msgid "Settings manager socket"
 msgstr "مقبس مدير الإعدادات"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "إعداد سلوك و إختصارات النافذة"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "مدير النوافذ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "تهذيب سلوك و تأتيرات النافذة"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "إعداد سلوك و إختصارات النافذة"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "تضبيطات لمدير النوافذ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "حدد عدد و إسماء مساحات العمل"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "تهذيب سلوك و تأتيرات النافذة"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "مساحات العمل"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>صندوق التحريك و التحجيم</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>زر التصميم</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>إخرا_ء الضغط المزدوج</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_سمة</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>نموذج البؤرة</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>خط ال_عنوان</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>بؤرة نافذة جديدة</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>محا_ذاة العنوان</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>رفع عند الضغط</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "أنقر و إسحب الأزرار كي تغيّر التصميم"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>رفع عند التركيز</b>"
+msgid "Title"
+msgstr "العنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>محا_ذاة العنوان</b>"
+msgid "The window title cannot be removed"
+msgstr "عنوان النافذة ، لا يمكن حذفه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>خط ال_عنوان</b>"
+msgid "Active"
+msgstr "نشِّط"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>إ_ختصار النافذة</b>"
+msgid "Menu"
+msgstr "قائمة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>جذب النوافذ</b>"
+msgid "Stick"
+msgstr "ثبِّت"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>صفِّف بيئات العمل</b>"
+msgid "Shade"
+msgstr "ظلّل"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_سمة</b>"
+msgid "Minimize"
+msgstr "صغر"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "كبّر"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>طويل</i>"
+msgid "Close"
+msgstr "اغلق"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "مخفي"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>قصير</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>زر التصميم</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "الأس_لوب"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>صغير</i>"
+msgid "_Reset to Defaults"
+msgstr "إعادة إلى الحالة الإفتراضية"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>إ_ختصار النافذة</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>واسع</i>"
+msgid "Ke_yboard"
+msgstr "لوحة الم_فاتيح"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "نشِّط"
+msgid "Clic_k to focus"
+msgstr "ضغط لتركيز"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "مت_قدم"
+msgid "Focus follows _mouse"
+msgstr "النركيز ي_تلي الفأرة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_إرفع النوافذ تلقائيا عندما تتلقى البؤرة"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "اعطي البؤرة  تلقائيا للنوافذ ال_منشأة حديثاً"
+msgid "_Delay before window receives focus:"
+msgstr "المهلة قبل رفع النافذة ذات البؤرة :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "ضغط لتركيز"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "أنقر و إسحب الأزرار كي تغيّر التصميم"
+msgid "<i>Short</i>"
+msgstr "<i>قصير</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "اغلق"
+msgid "<i>Long</i>"
+msgstr "<i>طويل</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>نموذج البؤرة</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "التأخير قبل رفع النافذة ذات البؤرة :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "اعطي البؤرة  تلقائيا للنوافذ ال_منشأة حديثاً"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "الم_سافة :"
+msgid "<b>New window focus</b>"
+msgstr "<b>بؤرة نافذة جديدة</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "النركيز ي_تلي الفأرة"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_إرفع النوافذ تلقائيا عندما تتلقى البؤرة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "مخفي"
+msgid "Delay _before raising focused window:"
+msgstr "التأخير قبل رفع النافذة ذات البؤرة :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "إخفاء محتويات النوافذ عن_د التحريك"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>رفع عند التركيز</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "إخفاء محتويات النوافذ عند التح_جيم"
+msgid "Raise window when clicking _inside application window"
+msgstr "ارفع النافذة عند النقر داخل نافذة التطبيق"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "لوحة الم_فاتيح"
+msgid "<b>Raise on click</b>"
+msgstr "<b>رفع عند الضغط</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "كبّر"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_بُؤرة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "قائمة"
+msgid "Snap windows to screen _border"
+msgstr "إجذب النوافذ  إلى حدود الشاشة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "صغر"
+msgid "Snap windows to other _windows"
+msgstr "إجذب النوافذ  إلى النوافذ الأخرى"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "ارفع النافذة عند النقر داخل نافذة التطبيق"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ظلّل"
+msgid "Dis_tance:"
+msgstr "الم_سافة :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "إجذب النوافذ  إلى النوافذ الأخرى"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "إجذب النوافذ  إلى حدود الشاشة"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>صغير</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "ثبِّت"
+msgid "<i>Wide</i>"
+msgstr "<i>واسع</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "الإجراء الذي سينفّذ عند النقر المزدوج على شريط العنوان :"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>جذب النوافذ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "عنوان النافذة ، لا يمكن حذفه"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "صفِّف مساحات العمل عند سحب نافذة خارج حدود الشاشة"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "العنوان"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "صفف مساحات العمل عند سحب نافذة _خارج حدود الشاشة"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_مقاومة الحافة :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>صفِّف بيئات العمل</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "صفِّف مساحات العمل عند سحب نافذة خارج حدود الشاشة"
+msgid "Hide content of windows when _resizing"
+msgstr "إخفاء محتويات النوافذ عند التح_جيم"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "المهلة قبل رفع النافذة ذات البؤرة :"
+msgid "Hide content of windows when _moving"
+msgstr "إخفاء محتويات النوافذ عن_د التحريك"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_مقاومة الحافة :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>صندوق التحريك و التحجيم</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_بُؤرة"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "الإجراء الذي سينفّذ عند النقر المزدوج على شريط العنوان :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "إعادة إلى الحالة الإفتراضية"
+msgid "<b>Double click _action</b>"
+msgstr "<b>إخرا_ء الضغط المزدوج</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "الأس_لوب"
+msgid "Ad_vanced"
+msgstr "مت_قدم"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -659,202 +660,212 @@ msgstr ""
 "هذا يبقوم بإعادة تعيين كل الإختصارات إلى القيمة الإفتراضية.هل تريد حقا فعل "
 "هذا؟"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>عريض</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>معتم</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"تخطّى النوافذ ذات الخصائص \"skip pager\"\n"
+" أو \"skip taskbar\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "تضمّن النوافذ المخفيّة ( أي المصغرة إلى قياس أيقونات)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>شفافية</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "دُر على كلّ النوافذ من كلّ مساحات العمل"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "نشِّط منع سرقة التركيز"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "ر_سم إطار حول النوافذ المحددة عند التدوير"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "ع_ند مركز الشاشة"
+msgid "C_ycling"
+msgstr "_دوران"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "مكان النوافذ, إفتراضيا:"
+msgid "Activate _focus stealing prevention"
+msgstr "نشِّط منع سرقة التركيز"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "تنضيد"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "احترم تلميح بؤرة ICCCM القياسي"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_دوران"
+msgid "When a window raises itself:"
+msgstr "عند رفع النافذة لنفسها:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "دُر على كلّ النوافذ من كلّ مساحات العمل"
+msgid "_Bring window on current workspace"
+msgstr "_حلب النافذة إلى مساحة العمل الحالية"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "عرض نوافذ تغطية ملء الشاشة مباشرة"
+msgid "Switch to win_dow's workspace"
+msgstr "أنقل النافذة لمساحة العمل %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "لا تفعل _شيء"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "إخفاء إطار النوافذ عند تكبير النوافذ"
+msgid "Key used to _grab and move windows:"
+msgstr "المفتاح المستخدم لالتقاط ونقل النوافذ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "احترم تلميح بؤرة ICCCM القياسي"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "أرفع النوافذ عند ضغط على أي زرّ للفأرة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "نرك النوافذ العاجلة تومض مرارا"
+msgid "Hide _frame of windows when maximized"
+msgstr "إخفاء إطار النوافذ عند تكبير النوافذ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "المفتاح المستخدم لالتقاط ونقل النوافذ"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "عند تحريكها ، إستعد قياس النوافذ المصغرة الأصلي"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "إشعار بالنوافذ العاجلة بجعل زينة النوافذ تومض"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "إستخدم مقاومة الحواف بدلا من جذب النوافذ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "عتامة زينة النوافذ:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "إشعار بالنوافذ العاجلة بجعل زينة النوافذ تومض"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "عتامة النوافذ غير النشطة:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "نرك النوافذ العاجلة تومض مرارا"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "عتامة النوافذ المنبثقة:"
+msgid "_Accessibility"
+msgstr "إتا_حة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "عتامة النوافذ خلال التحريك:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "إستعمل عجلة الفأرة في سطح المكتب لإبدال مساحة العمل"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "عتامة النوافذ خلال التحجيم:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "عند تحريكها ، إستعد قياس النوافذ المصغرة الأصلي"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"تذكّر و استدعي مساحة العمل السابقة عند التبديل بواسطة إختصارات لوحة المفاتيح"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "أظهر ظل تحت حوض النوافذ"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "لف مساحات العمل طبقا لهيئة سطح المكتب الفعليّة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "أظهر ظل تحت النوافذ العاديّة"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "لف حول مساحات العمل عند الوصول للأولى أو الأخيرة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "أظهر ظل تحت النوافذ المنبثقة"
+msgid "_Workspaces"
+msgstr "مساحات _العمل"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "أنقل النافذة لمساحة العمل %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "تحت مؤ_شر الفأرة"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "إستخدم مقاومة الحواف بدلا من جذب النوافذ"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "إستعمل عجلة الفأرة في سطح المكتب لإبدال مساحة العمل"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "قياس النوافذ الأدنى لإطلاق الموضع الذكي"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "عند رفع النافذة لنفسها:"
+msgid "<i>Large</i>"
+msgstr "<i>عريض</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "مكان النوافذ, إفتراضيا:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "لف مساحات العمل طبقا لهيئة سطح المكتب الفعليّة"
+msgid "At the _center of the screen"
+msgstr "ع_ند مركز الشاشة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "لف حول مساحات العمل عند الوصول للأولى أو الأخيرة"
+msgid "Under the mouse _pointer"
+msgstr "تحت مؤ_شر الفأرة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "إتا_حة"
+msgid "_Placement"
+msgstr "_وضع"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_حلب النافذة إلى مساحة العمل الحالية"
+msgid "_Enable display compositing"
+msgstr "فعِّل مزج العرض"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "ر_سم إطار حول النوافذ المحددة عند التدوير"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "عرض نوافذ تغطية ملء الشاشة مباشرة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "فعِّل مزج العرض"
+msgid "Show shadows under _regular windows"
+msgstr "أظهر ظل تحت النوافذ العاديّة"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "أظهر ظل تحت النوافذ المنبثقة"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "تضمّن النوافذ المخفيّة ( أي المصغرة إلى قياس أيقونات)"
+msgid "Show shadows under _dock windows"
+msgstr "أظهر ظل تحت حوض النوافذ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "قياس النوافذ الأدنى لإطلاق الموضع الذكي"
+msgid "Opaci_ty of window decorations:"
+msgstr "عتامة زينة النوافذ:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_وضع"
+msgid "<i>Transparent</i>"
+msgstr "<i>شفافية</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "أرفع النوافذ عند ضغط على أي زرّ للفأرة"
+msgid "<i>Opaque</i>"
+msgstr "<i>معتم</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"تذكّر و استدعي مساحة العمل السابقة عند التبديل بواسطة إختصارات لوحة المفاتيح"
+msgid "Opacity of _inactive windows:"
+msgstr "عتامة النوافذ غير النشطة:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "عتامة النوافذ خلال التحريك:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"تخطّى النوافذ ذات الخصائص \"skip pager\"\n"
-" أو \"skip taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "عتامة النوافذ خلال التحجيم:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "عتامة النوافذ المنبثقة:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "مساحات _العمل"
+msgid "C_ompositor"
+msgstr "تنضيد"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>الهوامش</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "عدد مساحات العمل:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>مساحات العمل</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "الإسم:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "الهوامش هي مناطق على حواف الشاشة لا توضع عليها أي نوافذ"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "عدد مساحات العمل:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "الهوامش"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -862,35 +873,35 @@ msgstr "عدد مساحات العمل:"
 msgid "%s (on %s)"
 msgstr "%s (على %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "تفرغ إلى الخلفية"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "تفرغ إلى الخلفية غير مدعوم)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "تحديد وضع المنضد"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "تحديد وضع المنضد (غير مدعوم)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "إستبدل مدير النوافذ الحالي"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "أكتب معلومات الإصدار والخروج"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[حجج...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "أكتب \"%s --help\" لإستعمال."
@@ -1022,6 +1033,15 @@ msgstr "خطأ عند قراءة البيانات من العملية البنت
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "لا يمكن توليد helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "حدد عدد و إسماء مساحات العمل"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>الهوامش</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>مساحات العمل</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "غير إسم مساحة العمل"
 
@@ -1198,9 +1218,6 @@ msgstr "لا يمكن توليد helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "غيّر الإسم"
 
-#~ msgid "Name:"
-#~ msgstr "الإسم:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "أنقر على مساحة العمل للتحريرها"
 
@@ -1216,9 +1233,6 @@ msgstr "لا يمكن توليد helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "مساحات العمل و الهوامش"
 
-#~ msgid "Margins"
-#~ msgstr "الهوامش"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "إعدادات مدير النوافذ"
 
diff --git a/po/ast.po b/po/ast.po
index 33d273b..d87010c 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-07-06 17:04+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -77,246 +77,246 @@ msgid "Settings manager socket"
 msgstr "Socket del alministrador de configuración"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configura'l comportamientu de ventanes y atayos"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Xestor de ventanes"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Axuste finu de comportamientu y efeutos de ventanes"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configura'l comportamientu de ventanes y atayos"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Axustes del xestor de ventanes"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Configura'l númberu y los nomes de les estayes de trabayu"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Axuste finu de comportamientu y efeutos de ventanes"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Estayes de trabayu"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Desplazamientu y redimensionáu de caxa</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Distribución de botones</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Aición al facer duble clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modelu de focu</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Triba de lletra del títulu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Focu pa nueves ventanes</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Alliniación del títulu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Trayer al frente al calcar</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Calcar y arrastrar los botones pa camudar la distribución"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Trayer al frente al garrar focu</b>"
+msgid "Title"
+msgstr "Títulu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Alliniación del títulu</b>"
+msgid "The window title cannot be removed"
+msgstr "El títulu de la ventana nun puede ser desaniciáu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Triba de lletra del títulu</b>"
+msgid "Active"
+msgstr "Activa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Ata_yos pa ventanes</b>"
+msgid "Menu"
+msgstr "Menú"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Atracción ente ventanes</b>"
+msgid "Stick"
+msgstr "Apegar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Recorríu cíclicu d'estayes de trabayu</b>"
+msgid "Shade"
+msgstr "Endolcar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Mi_nimizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "<i>Llargu</i>"
+msgid "Close"
+msgstr "Zarrar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Anubría"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
-msgid "<i>Short</i>"
-msgstr "<i>Curtiu</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Distribución de botones</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stilu"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-#, fuzzy
-msgid "<i>Small</i>"
-msgstr "<i>Pequeñu</i>"
+msgid "_Reset to Defaults"
+msgstr "_Restablecer valores predeterminaos"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Ata_yos pa ventanes</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
-msgid "<i>Wide</i>"
-msgstr "<i>Grande</i>"
+msgid "Ke_yboard"
+msgstr "Te_cláu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Activa"
+msgid "Clic_k to focus"
+msgstr "Cal_car pa dar focu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vanzáu"
+msgid "Focus follows _mouse"
+msgstr "El focu sigue al _mur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Trayer al f_rente automáticamente les ventanes cuando garren el focu"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Dar el focu automáticamente a les ventanes _nueves"
+msgid "_Delay before window receives focus:"
+msgstr "_Tiempu d'espera enantes que la ventana garre'l focu:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Cal_car pa dar focu"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Calcar y arrastrar los botones pa camudar la distribución"
+#, fuzzy
+msgid "<i>Short</i>"
+msgstr "<i>Curtiu</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Zarrar"
+#, fuzzy
+msgid "<i>Long</i>"
+msgstr "<i>Llargu</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modelu de focu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Tiempu d'espera _enantes de trayer al frente'l ventana col focu:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Dar el focu automáticamente a les ventanes _nueves"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tancia:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Focu pa nueves ventanes</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "El focu sigue al _mur"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Trayer al f_rente automáticamente les ventanes cuando garren el focu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Anubría"
+msgid "Delay _before raising focused window:"
+msgstr "Tiempu d'espera _enantes de trayer al frente'l ventana col focu:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Anubrir el conteníu de la ventana al _desplazar"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Trayer al frente al garrar focu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Anubrir el conteníu de les ventanes al _redimensionar"
+msgid "Raise window when clicking _inside application window"
+msgstr "Trayer al frente la ventana cuando calques _dientro d'ella"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Te_cláu"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Trayer al frente al calcar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Focu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menú"
+msgid "Snap windows to screen _border"
+msgstr "Apegar ventanes al _berbesu del escritoriu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Mi_nimizar"
+msgid "Snap windows to other _windows"
+msgstr "Atrayer _ventanes ente sí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Trayer al frente la ventana cuando calques _dientro d'ella"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Endolcar"
+msgid "Dis_tance:"
+msgstr "Dis_tancia:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Atrayer _ventanes ente sí"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Apegar ventanes al _berbesu del escritoriu"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#, fuzzy
+msgid "<i>Small</i>"
+msgstr "<i>Pequeñu</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Apegar"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "<i>Grande</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Aición cuando se fae duble clic na barra de títulu"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Atracción ente ventanes</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "El títulu de la ventana nun puede ser desaniciáu"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Saltar a la siguiente estaya de trabayu cuando'l _punteru llegue al berbesu "
+"de la pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Títulu"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Saltar a la siguiente estaya de trabayu al a_rrastrar un ventana fuera de la "
 "estaya de trabayu actual"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Resistencia nos _berbesos:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Recorríu cíclicu d'estayes de trabayu</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Saltar a la siguiente estaya de trabayu cuando'l _punteru llegue al berbesu "
-"de la pantalla"
+msgid "Hide content of windows when _resizing"
+msgstr "Anubrir el conteníu de les ventanes al _redimensionar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Tiempu d'espera enantes que la ventana garre'l focu:"
+msgid "Hide content of windows when _moving"
+msgstr "Anubrir el conteníu de la ventana al _desplazar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Resistencia nos _berbesos:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Desplazamientu y redimensionáu de caxa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Focu"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Aición cuando se fae duble clic na barra de títulu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Restablecer valores predeterminaos"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Aición al facer duble clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stilu"
+msgid "Ad_vanced"
+msgstr "A_vanzáu"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -660,208 +660,218 @@ msgstr ""
 "Esto restablecez tolos atayos a los valores predeterminaos. ¿Daveres quies "
 "facer esto?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
-msgid "<i>Large</i>"
-msgstr "<i>Grande</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opacu</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Omitir ventanes que tienen actives les\n"
+"propiedaes \"omitir seleutor de xeres\" y \"omitir barra de xeres\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Incluyir ventanes anubríes (i.e. miniaturizaes)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Tresparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Seleicionar cíclicamente los ventanes de toles estayes de trabayu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activar la prevención de perda de _focu"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Dibuxar marcu al rodiu de les ventanes esbillaes durante la Escoyeta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Nel _centru de la pantalla"
+msgid "C_ycling"
+msgstr "_Escoyeta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Por defeutu, allugar ventanes:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activar la prevención de perda de _focu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Respetar _standard ICCCM d'obtención de focu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Escoyeta"
+msgid "When a window raises itself:"
+msgstr "Cuando una ventana aparez por sí mesma:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Seleicionar cíclicamente los ventanes de toles estayes de trabayu"
+msgid "_Bring window on current workspace"
+msgstr "_Trayer ventana a la estaya de trabayu actual"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Amosar direutamente superposición de ventanes a _pantalla completa"
+msgid "Switch to win_dow's workspace"
+msgstr "Camudar la estaya de trabayu del _ventana"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Nun facer un _res"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Anubrir _marcu de ventanes al maximizar"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla usada pa _grabar y desplazar ventanes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Respetar _standard ICCCM d'obtención de focu"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Elevar ventanes al calcar cualesquier botón del mur"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Caltener les ventanes urxentes pa_rpaguiando repetidamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Anubrir _marcu de ventanes al maximizar"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla usada pa _grabar y desplazar ventanes:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Restaurar el _tamañu orixinal de ventanes maximizaes al ser desplazaes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notificar la _urxencia faciendo parpaguiar la decoración del ventana"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Usar resistencia de _berbesu en llugar d'atracción ente ventanes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_dá de la decoración de ventanes:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notificar la _urxencia faciendo parpaguiar la decoración del ventana"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacidá de ventanes _inactives:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Caltener les ventanes urxentes pa_rpaguiando repetidamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacidá de ventano_s emerxentes:"
+msgid "_Accessibility"
+msgstr "_Accesibilidá"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacidá de ventanes al des_plazase:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Usar la _rueda del mur sobro l'escritoriu pa camudar d'estaya de trabayu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacidá de ventanes durante _redimensionáu:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Restaurar el _tamañu orixinal de ventanes maximizaes al ser desplazaes"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Remembrar estayes de trabayu previes\n"
+"al camudar per aciu d'atayos de tecláu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Amosar solombres baxo ventanes _empotrables"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Camudar d'estaya de trabayu dependiendo de la _disposición real d'escritoriu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Amosar somlobres baxo ventanes _normales"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Desplazamientu _cíclicu ente estayes de trabayu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Amosar somlobres baxo ventanos _emerxentes"
+msgid "_Workspaces"
+msgstr "Estayes de _trabayu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Camudar la estaya de trabayu del _ventana"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Baxo'l _punteru del mur"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Usar resistencia de _berbesu en llugar d'atracción ente ventanes"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Usar la _rueda del mur sobro l'escritoriu pa camudar d'estaya de trabayu"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Tamañu _mínimu de ventana p'activar posicionamientu intelixente"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Cuando una ventana aparez por sí mesma:"
+#, fuzzy
+msgid "<i>Large</i>"
+msgstr "<i>Grande</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Por defeutu, allugar ventanes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Camudar d'estaya de trabayu dependiendo de la _disposición real d'escritoriu"
+msgid "At the _center of the screen"
+msgstr "Nel _centru de la pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Desplazamientu _cíclicu ente estayes de trabayu"
+msgid "Under the mouse _pointer"
+msgstr "Baxo'l _punteru del mur"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accesibilidá"
+msgid "_Placement"
+msgstr "_Posicionamientu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Trayer ventana a la estaya de trabayu actual"
+msgid "_Enable display compositing"
+msgstr "_Activar composición de visualización"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Dibuxar marcu al rodiu de les ventanes esbillaes durante la Escoyeta"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Amosar direutamente superposición de ventanes a _pantalla completa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Activar composición de visualización"
+msgid "Show shadows under _regular windows"
+msgstr "Amosar somlobres baxo ventanes _normales"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Amosar somlobres baxo ventanos _emerxentes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Incluyir ventanes anubríes (i.e. miniaturizaes)"
+msgid "Show shadows under _dock windows"
+msgstr "Amosar solombres baxo ventanes _empotrables"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Tamañu _mínimu de ventana p'activar posicionamientu intelixente"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_dá de la decoración de ventanes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Posicionamientu"
+msgid "<i>Transparent</i>"
+msgstr "<i>Tresparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Elevar ventanes al calcar cualesquier botón del mur"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opacu</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Remembrar estayes de trabayu previes\n"
-"al camudar per aciu d'atayos de tecláu"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacidá de ventanes _inactives:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacidá de ventanes al des_plazase:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Omitir ventanes que tienen actives les\n"
-"propiedaes \"omitir seleutor de xeres\" y \"omitir barra de xeres\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacidá de ventanes durante _redimensionáu:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacidá de ventano_s emerxentes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Estayes de _trabayu"
+msgid "C_ompositor"
+msgstr "C_ompositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Márxenes</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Númberu d'estayes de trabayu:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Estayes de trabayu</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nome:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Los márxenes son estayes a los llaos de la pantalla au nun s'allugará "
 "denguna ventana"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Númberu d'estayes de trabayu:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Márxenes</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -869,36 +879,36 @@ msgstr "_Númberu d'estayes de trabayu:"
 msgid "%s (on %s)"
 msgstr "%s (en %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "Información de versión"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1032,12 +1042,15 @@ msgstr "Fallu al lleer datos del procesu fíu: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nun puede estenderexase'l diálogu d'aida: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Configura'l númberu y los nomes de les estayes de trabayu"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Estayes de trabayu</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Camudar nome de la estaya de trabayu"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nome:"
-
 #~ msgid "Hide"
 #~ msgstr "Anubrir"
 
diff --git a/po/az.po b/po/az.po
index 84cd861..ff16d26 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2004-08-23 18:04+0300\n"
 "Last-Translator: Mətin Əmirov <metin at karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az at lists.sourceforge.net>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,279 +79,278 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Pəncərə İdarəçisi"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "Pəncərə İdarəçisi"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "İş sahəsi ədədi:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "İş Sahələri"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Şəffaf daşınma və ölçüləndirmə"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Düymə düzülüşü"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Cüt tıqlama gedişatı"
+msgid "<b>_Theme</b>"
+msgstr "Başlıq Hizası"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Fokus növü"
+msgid "<b>Title fon_t</b>"
+msgstr "Başlıq yazı növü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Yeni pəncərə fokusu"
+msgid "<b>Title _alignment</b>"
+msgstr "Başlıq Hizası"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Tıqlamada qabağa gətir"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Düzülüşü dəyişdirmək üçün düymələri tıqlayın və daşıyın"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Fokus veriləndə qabağa gətir"
+msgid "Title"
+msgstr "Başlıq"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Başlıq Hizası"
+msgid "The window title cannot be removed"
+msgstr "Pəncərə etiketi, silinə bilməz"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Başlıq yazı növü"
+msgid "Active"
+msgstr "Fəal"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Pəncərə qısa yolları"
+msgid "Menu"
+msgstr "Menyu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Pəncərələrin yapışması"
+msgid "Stick"
+msgstr "Sabitlə"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "İş sahələrini dəyişdir"
+msgid "Shade"
+msgstr "Bur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Başlıq Hizası"
+msgid "Minimize"
+msgstr "_Böyüt"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Böyüt"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "Bağla"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Gizli"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "Düymə düzülüşü"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Tərz"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Kiçik"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Pəncərə qısa yolları"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Məsafə :"
+msgid "Ke_yboard"
+msgstr "Klaviatura"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Fəal"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Fokus üçün tıqlansın"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Təfərruatlar"
+msgid "Focus follows _mouse"
+msgstr "Fokus siçanı izləsin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Pəncərələrə fokus veriləndə onları avtomatik olaraq qabağa gətir"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Yeni yaradılmış pəncərələri avtomatik olaraq fokusa al"
+msgid "_Delay before window receives focus:"
+msgstr "Fokuslu pəncərənin qabağa gəlmə gecikməsi :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "Fokus üçün tıqlansın"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Düzülüşü dəyişdirmək üçün düymələri tıqlayın və daşıyın"
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Bağla"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Fokus növü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Fokuslu pəncərənin qabağa gəlmə gecikməsi :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Yeni yaradılmış pəncərələri avtomatik olaraq fokusa al"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Məsafə :"
+msgid "<b>New window focus</b>"
+msgstr "Yeni pəncərə fokusu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Fokus siçanı izləsin"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Pəncərələrə fokus veriləndə onları avtomatik olaraq qabağa gətir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Gizli"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Fokuslu pəncərənin qabağa gəlmə gecikməsi :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Daşındığında pəncərələrin məzmununu göstər"
+msgid "<b>Raise on focus</b>"
+msgstr "Fokus veriləndə qabağa gətir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
+msgid "Raise window when clicking _inside application window"
+msgstr "Proqram pəncərəsinin içinə tıqlandığında pəncərəni qabağa gətir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Klaviatura"
+msgid "<b>Raise on click</b>"
+msgstr "Tıqlamada qabağa gətir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Böyüt"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menyu"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Pəncərələri ekran kənarlarına yapışdır"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "_Böyüt"
+msgid "Snap windows to other _windows"
+msgstr "Pəncərələri birbirinə yapışdır"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Proqram pəncərəsinin içinə tıqlandığında pəncərəni qabağa gətir"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Bur"
+msgid "Dis_tance:"
+msgstr "Məsafə :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Pəncərələri birbirinə yapışdır"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Pəncərələri ekran kənarlarına yapışdır"
+msgid "<i>Small</i>"
+msgstr "Kiçik"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Sabitlə"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Məsafə :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Başlıq çubuğuna cüt tıqlandığında həyata keçiriləcək gedişat :"
+msgid "<b>Windows snapping</b>"
+msgstr "Pəncərələrin yapışması"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "Pəncərə etiketi, silinə bilməz"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Siçan ekran kənarına gəldiyində iş sahələrini dəyişdir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Başlıq"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 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"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Kənar Müqaviməti :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "İş sahələrini dəyişdir"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Siçan ekran kənarına gəldiyində iş sahələrini dəyişdir"
+msgid "Hide content of windows when _resizing"
+msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Fokuslu pəncərənin qabağa gəlmə gecikməsi :"
+msgid "Hide content of windows when _moving"
+msgstr "Daşındığında pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Kənar Müqaviməti :"
+msgid "<b>Box move and resize</b>"
+msgstr "Şəffaf daşınma və ölçüləndirmə"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Başlıq çubuğuna cüt tıqlandığında həyata keçiriləcək gedişat :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Cüt tıqlama gedişatı"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Tərz"
+msgid "Ad_vanced"
+msgstr "Təfərruatlar"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -738,48 +737,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "Pəncərəni növbəti iş sahəsinə daşı"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "Qısa yol yarat"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "Pəncərəni növbəti iş sahəsinə daşı"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Pəncərəni 1-ci iş sahəsinə daşı"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -787,166 +788,172 @@ msgid "Do _nothing"
 msgstr "Heçnə"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Daşındığında pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Daşındığında pəncərələrin məzmununu göstər"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Daşındığında pəncərələrin məzmununu göstər"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Daşındığında pəncərələrin məzmununu göstər"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Daşındığında pəncərələrin məzmununu göstər"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Siçan ekran kənarına gəldiyində iş sahələrini dəyişdir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Pəncərəni 1-ci iş sahəsinə daşı"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "İş Sahələri"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Siçan ekran kənarına gəldiyində iş sahələrini dəyişdir"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Pəncərəni növbəti iş sahəsinə daşı"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "Daşındığında pəncərələrin məzmununu göstər"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Daşındığında pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "Ölçüləndirirkən pəncərələrin məzmununu göstər"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Daşındığında pəncərələrin məzmununu göstər"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "İş Sahələri"
+msgid "C_ompositor"
+msgstr "Qısa yol yarat"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Kənarlar"
+msgid "_Number of workspaces:"
+msgstr "İş sahəsi ədədi:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "İş sahələrini dəyişdir"
+msgid "Names"
+msgstr "Ad:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Kənarlar, ekranın pəncərə yerləşdirilməyəcəyi yerləridir"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "İş sahəsi ədədi:"
+msgid "_Margins"
+msgstr "Kənarlar"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -954,36 +961,36 @@ msgstr "İş sahəsi ədədi:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Pəncərə İdarəçisi"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1127,6 +1134,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "İş sahəsi ədədi:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Kənarlar"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "İş sahələrini dəyişdir"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "İş sahəsi adları"
 
@@ -1238,10 +1257,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Adını dəyişdir"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Ad:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "İş sahəsinin adına tıqlayaraq dəyişdirə bilərsiniz"
 
@@ -1261,10 +1276,6 @@ msgstr ""
 #~ msgstr "İş Sahələri və Kənarlar"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Kənarlar"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "Pəncərə İdarəçisi"
 
diff --git a/po/be.po b/po/be.po
index bd4860a..3f23a9c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2007-09-10 00:08+0300\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk at gmail.com>\n"
 "Language-Team: Belarusian <xfce-i18n at xfce.org>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
 "X-Rosetta-Export-Date: 2007-01-01 23:28+0000\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,282 +79,281 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Скасаваць дзеяньне над вакном"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Кіраўнік вокнаў"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Скасаваць дзеяньне над вакном"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Наладкі Кіраўніка вокнаў"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Колькасьць працоўных прастораў:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Скасаваць дзеяньне над вакном"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Працоўныя прасторы"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Непразрыстае перамяшчэньне й зьмена памераў"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Разьмеркаваньне кнопак"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Узьдзеяньне двайное пстрычкі"
+msgid "<b>_Theme</b>"
+msgstr "Выроўніваньне загалоўка"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Мадэль засяроджаньня"
+msgid "<b>Title fon_t</b>"
+msgstr "Шрыфт загалоўка"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Засяроджаньне новага вакна"
+msgid "<b>Title _alignment</b>"
+msgstr "Выроўніваньне загалоўка"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Уздымаць па пстрычцы"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Перацягніце кнопкі, каб зьмяніць іх разьмеркаваньне"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Уздымаць пры атрыманьні засяроджаньня"
+msgid "Title"
+msgstr "Загаловак"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Выроўніваньне загалоўка"
+msgid "The window title cannot be removed"
+msgstr "Загаловак вакна ня можа быць выдалены"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Шрыфт загалоўка"
+msgid "Active"
+msgstr "Задзейнічана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Гарачыя клявішы"
+msgid "Menu"
+msgstr "Мэню"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Прыцягненьне вокнаў"
+msgid "Stick"
+msgstr "Прыляпіць"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Загортваньне прастораў"
+msgid "Shade"
+msgstr "Згарнуць"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Выроўніваньне загалоўка"
+msgid "Minimize"
+msgstr "Най_большыць"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Найбольшыць"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Вялікі"
+msgid "Close"
+msgstr "Зачыніць"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Схавана"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "Празрыстыя"
+msgid "<b>Button layout</b>"
+msgstr "Разьмеркаваньне кнопак"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Стыль"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Маленькі"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Гарачыя клявішы"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Шырокі"
+msgid "Ke_yboard"
+msgstr "Клявіятура"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Задзейнічана"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Пстрыкнуць для засяроджаньня"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Дадатковыя"
+msgid "Focus follows _mouse"
+msgstr "Засяроджаньне крочыць за мышой"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Аўтаматычна ўздымаць вокны, калі яны атрымліваюць засяроджаньне"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Аўтаматычна перадаваць засяроджаньне новым вокнам"
+msgid "_Delay before window receives focus:"
+msgstr "Затрымка перад тым, як вакно атрымае фокус"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "Пстрыкнуць для засяроджаньня"
+msgid "<i>Short</i>"
+msgstr "Празрыстыя"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Перацягніце кнопкі, каб зьмяніць іх разьмеркаваньне"
+msgid "<i>Long</i>"
+msgstr "Вялікі"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Зачыніць"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Мадэль засяроджаньня"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Затрымка перад уздыманьнем засяроджанага вакна:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Аўтаматычна перадаваць засяроджаньне новым вокнам"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Прамежак:"
+msgid "<b>New window focus</b>"
+msgstr "Засяроджаньне новага вакна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Засяроджаньне крочыць за мышой"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Аўтаматычна ўздымаць вокны, калі яны атрымліваюць засяроджаньне"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Схавана"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Затрымка перад уздыманьнем засяроджанага вакна:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Адлюстроўваць зьмест вокнаў пад час перамяшчэньня"
+msgid "<b>Raise on focus</b>"
+msgstr "Уздымаць пры атрыманьні засяроджаньня"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Адлюстроўваць зьмест вокнаў пад час зьмяненьня памераў"
+msgid "Raise window when clicking _inside application window"
+msgstr "Уздымаць вокны, калі адбываецца пстрык мышой у межах вакна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Клявіятура"
+msgid "<b>Raise on click</b>"
+msgstr "Уздымаць па пстрычцы"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Найбольшыць"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Засяроджаньне"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Мэню"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Працягненьне вокнаў да межаў экрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Най_большыць"
+msgid "Snap windows to other _windows"
+msgstr "Прыцягненьне вокнаў да іншых вокнаў"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Уздымаць вокны, калі адбываецца пстрык мышой у межах вакна"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Згарнуць"
+msgid "Dis_tance:"
+msgstr "Прамежак:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Прыцягненьне вокнаў да іншых вокнаў"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Працягненьне вокнаў да межаў экрана"
+msgid "<i>Small</i>"
+msgstr "Маленькі"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Прыляпіць"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Шырокі"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Узьдзеяньне двайной пстрычкі па загалоўку вакна:"
+msgid "<b>Windows snapping</b>"
+msgstr "Прыцягненьне вокнаў"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "Загаловак вакна ня можа быць выдалены"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Крочыць паміж працоўнымі прасторамі, калі паказьнік сягае за межы экрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Загаловак"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Крочыць паміж працоўнымі прасторамі, калі перацягваюцца вокны за межы экрана"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Супраціў межаў:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Загортваньне прастораў"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Крочыць паміж працоўнымі прасторамі, калі паказьнік сягае за межы экрана"
+msgid "Hide content of windows when _resizing"
+msgstr "Адлюстроўваць зьмест вокнаў пад час зьмяненьня памераў"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Затрымка перад тым, як вакно атрымае фокус"
+msgid "Hide content of windows when _moving"
+msgstr "Адлюстроўваць зьмест вокнаў пад час перамяшчэньня"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Супраціў межаў:"
+msgid "<b>Box move and resize</b>"
+msgstr "Непразрыстае перамяшчэньне й зьмена памераў"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Засяроджаньне"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Узьдзеяньне двайной пстрычкі па загалоўку вакна:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Узьдзеяньне двайное пстрычкі"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Стыль"
+msgid "Ad_vanced"
+msgstr "Дадатковыя"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -729,54 +728,57 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "Вялікі"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Абмінаць вокны, якія маюць уласьцівасьці \"абмінаць панэль задач\" і "
+"\"абмінаць вакно прастораў\""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "Непразрыстыя"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Уключыць схаваныя (найменшаныя) вокны"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "Празрыстыя"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Кругазварот усіх вокнаў з усіх працоўных прастораў"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "Абарона ад скраданьня засяроджаньня"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "Кругазварот"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "Абарона ад скраданьня засяроджаньня"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Складальнік"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Паважаць стандарт засяроджаньня ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "Кругазварот"
+msgid "When a window raises itself:"
+msgstr "Калі вакноў узьнімае сябе:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "Кругазварот усіх вокнаў з усіх працоўных прастораў"
+msgid "_Bring window on current workspace"
+msgstr "Перамясьціць вакно на бягучую прастору"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Адлюстроўваць наўпрост вокны, што перакрываюць увесь экран"
+msgid "Switch to win_dow's workspace"
+msgstr "Пераключыцца на прастору вакна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -785,187 +787,192 @@ msgstr "Нічога"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "Хаваць мяжу вакна, калі яно найбольшана"
+msgid "Key used to _grab and move windows:"
+msgstr "Клявіша для захопу і перамяшчэньня вокнаў"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Паважаць стандарт засяроджаньня ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Уздымаць вокны, калі націснута любая кнопка мышы"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "Хаваць мяжу вакна, калі яно найбольшана"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "Клявіша для захопу і перамяшчэньня вокнаў"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Аднаўляць зыходны памер найбольшаных вокнаў у час перамяшчэньня"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Выкарыстоўваць супраціў межаў, замест прыцягненьня да вокнаў"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Непразрыстыя межы вокнаў"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Непразрыстасьць неактыўнага вакна"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Раптоўныя вокны зьяўляюцца непразрыстымі"
+msgid "_Accessibility"
+msgstr "Даступнасьць"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Непразрыстя вокны ў час перамяшчэньня"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Непразрыстыя вокны ў час зьмены памераў"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Аднаўляць зыходны памер найбольшаных вокнаў у час перамяшчэньня"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Запамінаць і выклікаць папярэднюю прастору, калі пераключэньне ідзе праз "
+"камбінацыю клявішаў"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "Паказваць цені пад dock-вокнамі"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Загортваньне прастораў у залежнасьці ад актуальнага разьмеркаваньня"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "Паказваць цені пад звычайнымі вокнамі"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Крочыць паміж прасторамі, калі дасягаецца першая альбо апошняя"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "Паказваць цені пад раптоўнымі вокнамі"
+msgid "_Workspaces"
+msgstr "Працоўныя прасторы"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Пераключыцца на прастору вакна"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Найменшы памер вакна, для задзейнічаньня разумнага разьмяшчэньня"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Выкарыстоўваць супраціў межаў, замест прыцягненьня да вокнаў"
+msgid "<i>Large</i>"
+msgstr "Вялікі"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Калі вакноў узьнімае сябе:"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Загортваньне прастораў у залежнасьці ад актуальнага разьмеркаваньня"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Крочыць паміж прасторамі, калі дасягаецца першая альбо апошняя"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "Даступнасьць"
+msgid "_Placement"
+msgstr "Разьмяшчаньне"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Перамясьціць вакно на бягучую прастору"
+msgid "_Enable display compositing"
+msgstr "Уключыць кампазыцыйныя вокны"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Адлюстроўваць наўпрост вокны, што перакрываюць увесь экран"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "Уключыць кампазыцыйныя вокны"
+msgid "Show shadows under _regular windows"
+msgstr "Паказваць цені пад звычайнымі вокнамі"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "Паказваць цені пад раптоўнымі вокнамі"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Уключыць схаваныя (найменшаныя) вокны"
+msgid "Show shadows under _dock windows"
+msgstr "Паказваць цені пад dock-вокнамі"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Найменшы памер вакна, для задзейнічаньня разумнага разьмяшчэньня"
+msgid "Opaci_ty of window decorations:"
+msgstr "Непразрыстыя межы вокнаў"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "Разьмяшчаньне"
+msgid "<i>Transparent</i>"
+msgstr "Празрыстыя"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Уздымаць вокны, калі націснута любая кнопка мышы"
+msgid "<i>Opaque</i>"
+msgstr "Непразрыстыя"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Запамінаць і выклікаць папярэднюю прастору, калі пераключэньне ідзе праз "
-"камбінацыю клявішаў"
+msgid "Opacity of _inactive windows:"
+msgstr "Непразрыстасьць неактыўнага вакна"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Непразрыстя вокны ў час перамяшчэньня"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Абмінаць вокны, якія маюць уласьцівасьці \"абмінаць панэль задач\" і "
-"\"абмінаць вакно прастораў\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Непразрыстыя вокны ў час зьмены памераў"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Раптоўныя вокны зьяўляюцца непразрыстымі"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Працоўныя прасторы"
+msgid "C_ompositor"
+msgstr "Складальнік"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Водступы"
+msgid "_Number of workspaces:"
+msgstr "Колькасьць працоўных прастораў:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Загортваньне прастораў"
+msgid "Names"
+msgstr "Назва:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Водступы - гэта адмысловыя плошы па краёх экрана, дзе нельга разьмяшчаць "
 "вокны"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Колькасьць працоўных прастораў:"
+msgid "_Margins"
+msgstr "Водступы"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -973,36 +980,36 @@ msgstr "Колькасьць працоўных прастораў:"
 msgid "%s (on %s)"
 msgstr "%s (на вузьле %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Настаўленьні Кіраўніка вокнаў Xfce 4"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1146,6 +1153,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Колькасьць працоўных прастораў:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Водступы"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Загортваньне прастораў"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Назвы працоўных прастораў"
 
@@ -1368,10 +1387,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Зьмяніць назву"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Назва:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Пстрыкніце па назве працоўнае прасторы каб рэдагаваць яе"
 
@@ -1389,10 +1404,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Працоўныя прасторы й водсуты"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Водступы"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Настаўленьні Кіраўніка вокнаў"
 
diff --git a/po/bg.po b/po/bg.po
index f3c0251..04c8717 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-08-19 21:11+0900\n"
 "Last-Translator: Miroslav Yordanov <miordanov at i-space.org>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -78,284 +78,283 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Показва съдържанието на прозорците при промяна на размера"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Мениджър на прозорци"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Показва съдържанието на прозорците при промяна на размера"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "Мениджър на прозорци"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Превключване на работните места"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Показва съдържанието на прозорците при промяна на размера"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 #, fuzzy
 msgid "Workspaces"
 msgstr "Работно място %i"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Непрозрачно местене и промяна на размера"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Разположение на бутоните"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Действие при двойно натискане"
+msgid "<b>_Theme</b>"
+msgstr "Подравнение на заглавието"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Тип на фокуса"
+msgid "<b>Title fon_t</b>"
+msgstr "Шрифт на заглавието"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Новите прозорци се фокусират"
+msgid "<b>Title _alignment</b>"
+msgstr "Подравнение на заглавието"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Повдигане при натискане"
+msgid "Click and drag the buttons to change the layout"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Повдига при фокусиране"
+msgid "Title"
+msgstr "Заглавие"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Подравнение на заглавието"
+msgid "The window title cannot be removed"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Шрифт на заглавието"
+msgid "Active"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Новите прозорци се фокусират"
+msgid "Menu"
+msgstr "Меню"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Прилепване на прозорците"
+msgid "Stick"
+msgstr "Забодено"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Превключване на работните места"
+msgid "Shade"
+msgstr "Сянка"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Подравнение на заглавието"
+msgid "Minimize"
+msgstr "Максимизира"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Максимизира"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "Затваряне"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Скрит"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "Разположение на бутоните"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Заглавие"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Малко"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Новите прозорци се фокусират"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Разстояние :"
+msgid "Ke_yboard"
+msgstr "Клавишни комбинации"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr ""
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Натискане за фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Допълнителни"
+msgid "Focus follows _mouse"
+msgstr "Фокуса следва мишката"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Автоматично повдига прозорците·\n"
-"когато се фокусират"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr ""
-"Автоматично се фокусират\n"
-"новосъздадените прозорци"
+msgid "_Delay before window receives focus:"
+msgstr "Изчакване преди да се повдигне фокусирания прозорец :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "Натискане за фокус"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Затваряне"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Тип на фокуса"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Изчакване преди да се повдигне фокусирания прозорец :"
+msgid "Automatically give focus to _newly created windows"
+msgstr ""
+"Автоматично се фокусират\n"
+"новосъздадените прозорци"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Разстояние :"
+msgid "<b>New window focus</b>"
+msgstr "Новите прозорци се фокусират"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Фокуса следва мишката"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"Автоматично повдига прозорците·\n"
+"когато се фокусират"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Скрит"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Изчакване преди да се повдигне фокусирания прозорец :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Показва·съдържанието·на·прозорците·при местене"
+msgid "<b>Raise on focus</b>"
+msgstr "Повдига при фокусиране"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Показва съдържанието на прозорците при промяна на размера"
+msgid "Raise window when clicking _inside application window"
+msgstr ""
+"Повдига прозореца когато се натисне\n"
+"в прозореца на приложението"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Клавишни комбинации"
+msgid "<b>Raise on click</b>"
+msgstr "Повдигане при натискане"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Максимизира"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Тип на фокуса"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Меню"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Прилепва прозорците по границата на екрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Максимизира"
+msgid "Snap windows to other _windows"
+msgstr "Прилеплва прозорците до другите прозорци"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-"Повдига прозореца когато се натисне\n"
-"в прозореца на приложението"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Сянка"
+msgid "Dis_tance:"
+msgstr "Разстояние :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Прилеплва прозорците до другите прозорци"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Прилепва прозорците по границата на екрана"
+msgid "<i>Small</i>"
+msgstr "Малко"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Забодено"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Разстояние :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Действие което да се извърши при двойно натискане на заглавната лента"
+msgid "<b>Windows snapping</b>"
+msgstr "Прилепване на прозорците"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Превключва работните места когато курсора достигне края на екрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Заглавие"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Превклюва работните места когато се изтегля прозорец извън екрана"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Съпротивление по краищата :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Превключване на работните места"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Превключва работните места когато курсора достигне края на екрана"
+msgid "Hide content of windows when _resizing"
+msgstr "Показва съдържанието на прозорците при промяна на размера"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Изчакване преди да се повдигне фокусирания прозорец :"
+msgid "Hide content of windows when _moving"
+msgstr "Показва·съдържанието·на·прозорците·при местене"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Съпротивление по краищата :"
+msgid "<b>Box move and resize</b>"
+msgstr "Непрозрачно местене и промяна на размера"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Тип на фокуса"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Действие което да се извърши при двойно натискане на заглавната лента"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Действие при двойно натискане"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Заглавие"
+msgid "Ad_vanced"
+msgstr "Допълнителни"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -751,48 +750,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "Новите прозорци се фокусират"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "Клавишни комбинации"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "Новите прозорци се фокусират"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Новите прозорци се фокусират"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -800,168 +801,173 @@ msgid "Do _nothing"
 msgstr "Нищо"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Показва·съдържанието·на·прозорците·при местене"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Показва съдържанието на прозорците при промяна на размера"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Показва·съдържанието·на·прозорците·при местене"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Показва·съдържанието·на·прозорците·при местене"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Показва·съдържанието·на·прозорците·при местене"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Показва съдържанието на прозорците при промяна на размера"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Показва·съдържанието·на·прозорците·при местене"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Превключва работните места когато курсора достигне края на екрана"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Новите прозорци се фокусират"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "Работно място %i"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Превключва работните места когато курсора достигне края на екрана"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Новите прозорци се фокусират"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "Показва съдържанието на прозорците при промяна на размера"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "Показва·съдържанието·на·прозорците·при местене"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Показва·съдържанието·на·прозорците·при местене"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "Показва съдържанието на прозорците при промяна на размера"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Работно място %i"
+msgid "Opacity of popup window_s:"
+msgstr "Показва·съдържанието·на·прозорците·при местене"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Повдига при фокусиране"
+msgid "C_ompositor"
+msgstr "Клавишни комбинации"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Workspaces</b>"
+msgid "_Number of workspaces:"
 msgstr "Превключване на работните места"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Границите са пространства по краищата на екрана където няма да бъде поставян "
 "прозорец"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Превключване на работните места"
+msgid "_Margins"
+msgstr "Повдига при фокусиране"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -969,36 +975,36 @@ msgstr "Превключване на работните места"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Мениджър на прозорци"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1137,6 +1143,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Превключване на работните места"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Повдига при фокусиране"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Превключване на работните места"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Граница на работно място"
 
@@ -1259,10 +1277,6 @@ msgstr ""
 #~ msgstr "Граница на работно място"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Повдига при фокусиране"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "Мениджър на прозорци"
 
diff --git a/po/bn.po b/po/bn.po
index 58f3f3e..1b9f14e 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-03-31 18:45+0600\n"
 "Last-Translator: Israt Jahan <israt at ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -82,238 +82,238 @@ msgid "Settings manager socket"
 msgstr "সেটিংস ব্যবস্থাপক সকেট"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "উইন্ডোর আচরণ ও শর্টকাট কনফিগার"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "উইন্ডো ব্যবস্থাপক"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "ফাইন-টিউন উইন্ডো আচরণ ও প্রভাব"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "উইন্ডোর আচরণ ও শর্টকাট কনফিগার"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "উইন্ডো ব্যবস্থাপক টুইক"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "কর্মপরিসরের সংখ্যা ও নাম নির্ধারণ করুন"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "ফাইন-টিউন উইন্ডো আচরণ ও প্রভাব"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "কর্মপরিসর"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>বাক্স সরানো ও আকার পরিবর্তন</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>বোতামের বহির্বিন্যাস</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>ডবল ক্লিকের কাজ</b> (_a)"
+msgid "<b>_Theme</b>"
+msgstr "<b>থীম</b> (_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>ফোকাস মডেল</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>শিরোনামের ফন্ট</b> (_t)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>নতুন উইন্ডো ফোকাস</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>শিরোনাম প্রান্তিককরণ</b> (_a)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>ক্লিক করলে উঠানো হবে</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "বহির্বিন্যাস পরিবর্তন করার জন্য বোতামগুলোতে ক্লিক করে টেনে আনুন"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>ফোকাস করলে উঠানো হবে</b>"
+msgid "Title"
+msgstr "শিরোনাম"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>শিরোনাম প্রান্তিককরণ</b> (_a)"
+msgid "The window title cannot be removed"
+msgstr "উইন্ডোর শিরোনাম অপসারণ করা যাচ্ছে না"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>শিরোনামের ফন্ট</b> (_t)"
+msgid "Active"
+msgstr "সক্রিয়"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>উইন্ডোর শর্টকাট</b> (_s)"
+msgid "Menu"
+msgstr "মেনু"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>উইন্ডোর ছবি নিচ্ছে</b>"
+msgid "Stick"
+msgstr "স্টিক"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>মোড়ানো কর্মপরিসর</b>"
+msgid "Shade"
+msgstr "ছায়া"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>থীম</b> (_T)"
+#, fuzzy
+msgid "Minimize"
+msgstr "ন্যূনতম বিস্তার (_n)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "পূর্ণবিস্তার"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>দীর্ঘ</i>"
+msgid "Close"
+msgstr "বন্ধ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "লুকানো"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>ছোট</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>বোতামের বহির্বিন্যাস</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "শৈলী (_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>ছোট</i>"
+msgid "_Reset to Defaults"
+msgstr "পূর্বনির্ধারিততে পুনঃনির্ধারণ (_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>উইন্ডোর শর্টকাট</b> (_s)"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>প্রশস্ত</i>"
+msgid "Ke_yboard"
+msgstr "কীবোর্ড (_y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "সক্রিয়"
+msgid "Clic_k to focus"
+msgstr "ফোকাস করার জন্য ক্লিক করুন (_k)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "উন্নত (_v)"
+msgid "Focus follows _mouse"
+msgstr "ফোকাস মাউস অনুসরণ করে (_m)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "উইন্ডো ফোকাস করা হলে স্বয়ংক্রিয়ভাবে উঠানো হবে (_r)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "নতুন তৈরিকৃত উইন্ডোগুলোকে স্বয়ংক্রিয়ভাবে ফোকাস করা হবে"
+msgid "_Delay before window receives focus:"
+msgstr "উইন্ডো ফোকাস গ্রহণ করার আগের বিলম্ব: (_D)"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "ফোকাস করার জন্য ক্লিক করুন (_k)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "বহির্বিন্যাস পরিবর্তন করার জন্য বোতামগুলোতে ক্লিক করে টেনে আনুন"
+msgid "<i>Short</i>"
+msgstr "<i>ছোট</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "বন্ধ"
+msgid "<i>Long</i>"
+msgstr "<i>দীর্ঘ</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>ফোকাস মডেল</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "ফোকাসকৃত উইন্ডো উঠানোর পূর্বের বিলম্ব: (_b)"
+msgid "Automatically give focus to _newly created windows"
+msgstr "নতুন তৈরিকৃত উইন্ডোগুলোকে স্বয়ংক্রিয়ভাবে ফোকাস করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "দুরত্ব: (_t)"
+msgid "<b>New window focus</b>"
+msgstr "<b>নতুন উইন্ডো ফোকাস</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "ফোকাস মাউস অনুসরণ করে (_m)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "উইন্ডো ফোকাস করা হলে স্বয়ংক্রিয়ভাবে উঠানো হবে (_r)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "লুকানো"
+msgid "Delay _before raising focused window:"
+msgstr "ফোকাসকৃত উইন্ডো উঠানোর পূর্বের বিলম্ব: (_b)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "সরানোর সময় উইন্ডোর বিষয়বস্তু আড়াল করা হবে (_m)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>ফোকাস করলে উঠানো হবে</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "আকার পরিবর্তন করার সময় উইন্ডোর বিষয়বস্তু আড়াল করা হবে (_r)"
+msgid "Raise window when clicking _inside application window"
+msgstr "অভ্যন্তরীণ অ্যাপ্লিকেশন উইন্ডোয় ক্লিক করলে উইন্ডো উঠানো হবে (_i)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "কীবোর্ড (_y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>ক্লিক করলে উঠানো হবে</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "পূর্ণবিস্তার"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "ফোকাস (_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "মেনু"
+msgid "Snap windows to screen _border"
+msgstr "উইন্ডো থেকে পর্দার সীমানায় স্ন্যাপ (_b)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "ন্যূনতম বিস্তার (_n)"
+msgid "Snap windows to other _windows"
+msgstr "উইন্ডো থেকে অন্যান্য উইন্ডোতে স্ন্যাপ (_w)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "অভ্যন্তরীণ অ্যাপ্লিকেশন উইন্ডোয় ক্লিক করলে উইন্ডো উঠানো হবে (_i)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ছায়া"
+msgid "Dis_tance:"
+msgstr "দুরত্ব: (_t)"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "উইন্ডো থেকে অন্যান্য উইন্ডোতে স্ন্যাপ (_w)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "উইন্ডো থেকে পর্দার সীমানায় স্ন্যাপ (_b)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>ছোট</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "স্টিক"
+msgid "<i>Wide</i>"
+msgstr "<i>প্রশস্ত</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "টাইটেল-বারে ডবল-ক্লিক করা হলে যে কাজ করণীয়"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>উইন্ডোর ছবি নিচ্ছে</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "উইন্ডোর শিরোনাম অপসারণ করা যাচ্ছে না"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "পয়েন্টার পর্দার প্রান্তে পৌছালে কর্মপরিসর মোড়ানো হবে (_p)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "শিরোনাম"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "পর্দা থেকে কোন উইন্ডো টেনে আনার সময় কর্মপরিসর মোড়ানো হবে (_d)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "প্রান্তিক প্রতিরোধ: (_E)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>মোড়ানো কর্মপরিসর</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "পয়েন্টার পর্দার প্রান্তে পৌছালে কর্মপরিসর মোড়ানো হবে (_p)"
+msgid "Hide content of windows when _resizing"
+msgstr "আকার পরিবর্তন করার সময় উইন্ডোর বিষয়বস্তু আড়াল করা হবে (_r)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "উইন্ডো ফোকাস গ্রহণ করার আগের বিলম্ব: (_D)"
+msgid "Hide content of windows when _moving"
+msgstr "সরানোর সময় উইন্ডোর বিষয়বস্তু আড়াল করা হবে (_m)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "প্রান্তিক প্রতিরোধ: (_E)"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>বাক্স সরানো ও আকার পরিবর্তন</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "ফোকাস (_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "টাইটেল-বারে ডবল-ক্লিক করা হলে যে কাজ করণীয়"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "পূর্বনির্ধারিততে পুনঃনির্ধারণ (_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>ডবল ক্লিকের কাজ</b> (_a)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "শৈলী (_S)"
+msgid "Ad_vanced"
+msgstr "উন্নত (_v)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -656,203 +656,213 @@ msgstr ""
 "এটি সকল শর্টকাটকে এর পূর্বনির্ধারিত মানে পুনঃনির্ধারণ করবে। আপনি কি সত্যিই এটা করতে "
 "চান?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>বৃহৎ</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>অস্বচ্ছ</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"skip pager\"\n"
+"বা \"skip taskbar\" বৈশিষ্ট্যাবলী সেট সম্বলিত উইন্ডোসমূহকে এড়িয়ে যাওয়া হবে (_S)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "লুকানো (আইকনযুক্ত) উইন্ডোসমূহ অন্তর্ভুক্ত করা হবে (_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>স্বচ্ছ</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "উইন্ডোর মাধ্যমে সকল কর্মপরিসরের মধ্যে বৃত্তাকারে ঘোরা হবে (_t) "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "ফোকাস চুরি প্রতিরোধ সক্রিয় করা হবে (_f)"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "বৃত্তাকার করার সময় নির্বাচিত উইন্ডোসমূহের চারিদিকে ফ্রেম আঁকা হবে (_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "পর্দার কেন্দ্রে (_c)"
+msgid "C_ycling"
+msgstr "বৃত্তাকারে ঘোরা (_y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "পূর্বনির্ধারিতভাবে, উইন্ডো স্থাপন:"
+msgid "Activate _focus stealing prevention"
+msgstr "ফোকাস চুরি প্রতিরোধ সক্রিয় করা হবে (_f)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "কম্পোজিটর (_o)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "আদর্শ ICCCM ফোকাস ইঙ্গিতকে সম্মান প্রদর্শন করা হবে (_s)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "বৃত্তাকারে ঘোরা (_y)"
+msgid "When a window raises itself:"
+msgstr "যখন কোন উইন্ডো নিজে থেকেই উঠে যায়:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "উইন্ডোর মাধ্যমে সকল কর্মপরিসরের মধ্যে বৃত্তাকারে ঘোরা হবে (_t) "
+msgid "_Bring window on current workspace"
+msgstr "বর্তমান কর্মপরিসরে উইন্ডো আনা হবে (_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "সরাসরি পূর্ণপর্দার ওভারলে উইন্ডো প্রদর্শন (_f)"
+msgid "Switch to win_dow's workspace"
+msgstr "উইন্ডোর কর্মপরিসরের মধ্যে পরিবর্তন (_d)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "কিছুই করার প্রয়োজন নেই (_n)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "পূর্ণ বিস্তারের সময় উইন্ডোর ফ্রেম আড়ালে রাখা হবে (_f)"
+msgid "Key used to _grab and move windows:"
+msgstr "উইন্ডোসমূহকে টেনে আনা ও সরানোর জন্য যে কী ব্যবহার করা হয়: (_g)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "আদর্শ ICCCM ফোকাস ইঙ্গিতকে সম্মান প্রদর্শন করা হবে (_s)"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "যেকোন মাউস বোতাম চাপা হলেই উইন্ডো উঠানো হবে (_R) "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "জরুরী উইন্ডোসমূহকে পুনরাবৃত্তভাবে মিটিমিটি জ্বালানো হবে (_b)"
+msgid "Hide _frame of windows when maximized"
+msgstr "পূর্ণ বিস্তারের সময় উইন্ডোর ফ্রেম আড়ালে রাখা হবে (_f)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "উইন্ডোসমূহকে টেনে আনা ও সরানোর জন্য যে কী ব্যবহার করা হয়: (_g)"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "সরানোর সময় পূর্ণ বিস্তারের উইন্ডোর আদি আকার পুনরুদ্ধার করা হবে (_s)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "উইন্ডোর সজ্জা মিটিমিটি জ্বলার মাধ্যমে জরুরী বার্তা সম্পর্কে সচেতন করা হবে (_u)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "উইন্ডো স্ন্যাপিংয়ের পরিবর্তে প্রান্তিক প্রতিরোধ ব্যবহার "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "উইন্ডো সজ্জার অস্বচ্ছতা: (_t)"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "উইন্ডোর সজ্জা মিটিমিটি জ্বলার মাধ্যমে জরুরী বার্তা সম্পর্কে সচেতন করা হবে (_u)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "নিষ্ক্রিয় উইন্ডোর অস্বচ্ছতা: (_i)"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "জরুরী উইন্ডোসমূহকে পুনরাবৃত্তভাবে মিটিমিটি জ্বালানো হবে (_b)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "পপ আপ উইন্ডোর অস্বচ্ছতা: (_s)"
+msgid "_Accessibility"
+msgstr "স্বাচ্ছন্দ্যকরণ (_A)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "সরানোর সময় উইন্ডোর অস্বচ্ছতা: (_m)"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "কর্মপরিসর পরিবর্তন করতে ডেস্কটপে মাউসের চাকা ব্যবহার করা হবে (_m)   "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "আকার পরিবর্তনের সময় উইন্ডোর অস্বচ্ছতা: (_z)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "সরানোর সময় পূর্ণ বিস্তারের উইন্ডোর আদি আকার পুনরুদ্ধার করা হবে (_s)"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"কীবোর্ড শর্টকাটের দ্বারা পরিবর্তনের সময়\n"
+"পূর্ববর্তী কর্মপরিসর মনে রাখা হবে এবং পুনরায় কল করা হবে (_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "ডক উইন্ডোর নিচে ছায়া প্রদর্শন (_d)"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "প্রকৃত ডেস্কটপ বহির্বিন্যাসের উপর ভিত্তি করে কর্মপরিসর মোড়ানো হবে (_l)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "স্বাভাবিক উইন্ডোর নিচে ছায়া প্রদর্শন (_r)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "প্রথম অথবা সর্বশেষ কর্মপরিসরে পৌছানোর সময় কর্মপরিসর মোড়ানো হবে (_f)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "পপ আপ উইন্ডোর নিচে ছায়া প্রদর্শন (_u)"
+msgid "_Workspaces"
+msgstr "কর্মপরিসর (_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "উইন্ডোর কর্মপরিসরের মধ্যে পরিবর্তন (_d)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "মাউস পয়েন্টারের অধীনে (_p)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "উইন্ডো স্ন্যাপিংয়ের পরিবর্তে প্রান্তিক প্রতিরোধ ব্যবহার "
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "কর্মপরিসর পরিবর্তন করতে ডেস্কটপে মাউসের চাকা ব্যবহার করা হবে (_m)   "
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "পরিচ্ছন্ন অবস্থান ট্রিগার করতে উইন্ডোর সর্বনিম্ন আকার: (_M)"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "যখন কোন উইন্ডো নিজে থেকেই উঠে যায়:"
+msgid "<i>Large</i>"
+msgstr "<i>বৃহৎ</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "পূর্বনির্ধারিতভাবে, উইন্ডো স্থাপন:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "প্রকৃত ডেস্কটপ বহির্বিন্যাসের উপর ভিত্তি করে কর্মপরিসর মোড়ানো হবে (_l)"
+msgid "At the _center of the screen"
+msgstr "পর্দার কেন্দ্রে (_c)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "প্রথম অথবা সর্বশেষ কর্মপরিসরে পৌছানোর সময় কর্মপরিসর মোড়ানো হবে (_f)"
+msgid "Under the mouse _pointer"
+msgstr "মাউস পয়েন্টারের অধীনে (_p)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "স্বাচ্ছন্দ্যকরণ (_A)"
+msgid "_Placement"
+msgstr "অবস্থান নির্ধারণ (_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "বর্তমান কর্মপরিসরে উইন্ডো আনা হবে (_B)"
+msgid "_Enable display compositing"
+msgstr "প্রদর্শন কম্পোজিটিং সক্রিয় (_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "বৃত্তাকার করার সময় নির্বাচিত উইন্ডোসমূহের চারিদিকে ফ্রেম আঁকা হবে (_D)"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "সরাসরি পূর্ণপর্দার ওভারলে উইন্ডো প্রদর্শন (_f)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "প্রদর্শন কম্পোজিটিং সক্রিয় (_E)"
+msgid "Show shadows under _regular windows"
+msgstr "স্বাভাবিক উইন্ডোর নিচে ছায়া প্রদর্শন (_r)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "পপ আপ উইন্ডোর নিচে ছায়া প্রদর্শন (_u)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "লুকানো (আইকনযুক্ত) উইন্ডোসমূহ অন্তর্ভুক্ত করা হবে (_I)"
+msgid "Show shadows under _dock windows"
+msgstr "ডক উইন্ডোর নিচে ছায়া প্রদর্শন (_d)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "পরিচ্ছন্ন অবস্থান ট্রিগার করতে উইন্ডোর সর্বনিম্ন আকার: (_M)"
+msgid "Opaci_ty of window decorations:"
+msgstr "উইন্ডো সজ্জার অস্বচ্ছতা: (_t)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "অবস্থান নির্ধারণ (_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>স্বচ্ছ</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "যেকোন মাউস বোতাম চাপা হলেই উইন্ডো উঠানো হবে (_R) "
+msgid "<i>Opaque</i>"
+msgstr "<i>অস্বচ্ছ</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"কীবোর্ড শর্টকাটের দ্বারা পরিবর্তনের সময়\n"
-"পূর্ববর্তী কর্মপরিসর মনে রাখা হবে এবং পুনরায় কল করা হবে (_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "নিষ্ক্রিয় উইন্ডোর অস্বচ্ছতা: (_i)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "সরানোর সময় উইন্ডোর অস্বচ্ছতা: (_m)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"skip pager\"\n"
-"বা \"skip taskbar\" বৈশিষ্ট্যাবলী সেট সম্বলিত উইন্ডোসমূহকে এড়িয়ে যাওয়া হবে (_S)"
+msgid "Opacity of windows during resi_ze:"
+msgstr "আকার পরিবর্তনের সময় উইন্ডোর অস্বচ্ছতা: (_z)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "পপ আপ উইন্ডোর অস্বচ্ছতা: (_s)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "কর্মপরিসর (_W)"
+msgid "C_ompositor"
+msgstr "কম্পোজিটর (_o)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>মার্জিন</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "কর্মপরিসরের সংখ্যা: (_N)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>কর্মপরিসর</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "নাম: (_N)"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "মার্জিন হচ্ছে পর্দার প্রান্তের ক্ষেত্র যেখানে কোন উইন্ডো স্থাপন করা হয় না"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "কর্মপরিসরের সংখ্যা: (_N)"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>মার্জিন</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -860,36 +870,36 @@ msgstr "কর্মপরিসরের সংখ্যা: (_N)"
 msgid "%s (on %s)"
 msgstr "%s (%s-তে)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "সংস্করণ তথ্যাবলী"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1021,12 +1031,15 @@ msgstr "চাইল্ড প্রসেস থেকে উপাত্ত 
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "বিপুল সংখ্যক সহায়তাকারী-ডায়ালগ সৃষ্টি করা যাচ্ছে না: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "কর্মপরিসরের সংখ্যা ও নাম নির্ধারণ করুন"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>কর্মপরিসর</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "কর্মপরিসরের নাম পরিবর্তন"
 
-#~ msgid "_Name:"
-#~ msgstr "নাম: (_N)"
-
 #~ msgid "Hide"
 #~ msgstr "আড়াল করুন"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 4c4df10..170cdd3 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-04-07 12:14+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
 "Language-Team: Bangla INDIA <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,276 +79,275 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "উইন্ডো পরিচালন ব্যবস্থা"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "উইন্ডো পরিচালন ব্যবস্থা"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "কর্মক্ষেত্রের সংখ্যা:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "কর্মক্ষেত্র"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "বাটনের বিন্যাশ"
-
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "দুবার ক্লিক করার কর্ম"
+msgid "<b>_Theme</b>"
+msgstr "শিরোনামের দিশা"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Title fon_t</b>"
+msgstr "শিরোনামে ব্যবহৃত ফন্ট"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "নতুন উইন্ডো উজ্জ্বল করা হবে"
+msgid "<b>Title _alignment</b>"
+msgstr "শিরোনামের দিশা"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "ক্লিক করা হলে বড় করা হবে"
+msgid "Click and drag the buttons to change the layout"
+msgstr "বিন্যাশ পরিবর্তনের জন্য বাটন ক্লিক করে টেনে আনুন"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "উজ্জ্বল করা হলে বড় করা হবে"
+msgid "Title"
+msgstr "শিরোনাম"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "শিরোনামের দিশা"
+msgid "The window title cannot be removed"
+msgstr "উইন্ডোর শিরোনাম, মুছে ফেলা সম্ভব নয়"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "শিরোনামে ব্যবহৃত ফন্ট"
+msgid "Active"
+msgstr "সক্রিয়"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "উইন্ডোর শর্টকাট"
+msgid "Menu"
+msgstr "মেনু"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "উইন্ডো আটক করা"
+msgid "Stick"
+msgstr "আটক করুন"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+msgid "Shade"
+msgstr "ছায়া"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "শিরোনামের দিশা"
+msgid "Minimize"
+msgstr "বড় করুন (_x)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "বড় করুন"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "বন্ধ করুন"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "লুকোনো"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "বাটনের বিন্যাশ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "বিন্যাশ"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "ক্ষুদ্র"
+msgid "<b>Window _shortcuts</b>"
+msgstr "উইন্ডোর শর্টকাট"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "দূরত্ব :"
+msgid "Ke_yboard"
+msgstr "কী-বোর্ড"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "সক্রিয়"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "উজ্জ্বল করার জন্য ক্লিক করুন"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "উন্নত"
+msgid "Focus follows _mouse"
+msgstr "মাউস অনুসরণ করে উজ্জ্বল করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "উজ্জ্বল করা হলে স্বয়ংক্রিয়ভাবে উইন্ডো বড় করা হবে"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "নতুন উইন্ডোগুলিকে স্বয়ংক্রিয়ভাবে উজ্জ্বল করা হবে"
+msgid "_Delay before window receives focus:"
+msgstr "উজ্জ্বল করা উইন্ডো বড় করার পূর্ববর্তী বিরামকাল :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "উজ্জ্বল করার জন্য ক্লিক করুন"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "বিন্যাশ পরিবর্তনের জন্য বাটন ক্লিক করে টেনে আনুন"
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "বন্ধ করুন"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "উজ্জ্বল করা উইন্ডো বড় করার পূর্ববর্তী বিরামকাল :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "নতুন উইন্ডোগুলিকে স্বয়ংক্রিয়ভাবে উজ্জ্বল করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "দূরত্ব :"
+msgid "<b>New window focus</b>"
+msgstr "নতুন উইন্ডো উজ্জ্বল করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "মাউস অনুসরণ করে উজ্জ্বল করা হবে"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "উজ্জ্বল করা হলে স্বয়ংক্রিয়ভাবে উইন্ডো বড় করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "লুকোনো"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "উজ্জ্বল করা উইন্ডো বড় করার পূর্ববর্তী বিরামকাল :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "<b>Raise on focus</b>"
+msgstr "উজ্জ্বল করা হলে বড় করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "Raise window when clicking _inside application window"
+msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে ক্লিক করা হলে উইন্ডো বড় করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "কী-বোর্ড"
+msgid "<b>Raise on click</b>"
+msgstr "ক্লিক করা হলে বড় করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "বড় করুন"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "উজ্জ্বল"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "মেনু"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "পর্দার প্রান্তের সাথে উইন্ডো আটক করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "বড় করুন (_x)"
+msgid "Snap windows to other _windows"
+msgstr "অন্যান্য উইন্ডোর সাথে উইন্ডো আটক করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে ক্লিক করা হলে উইন্ডো বড় করা হবে"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ছায়া"
+msgid "Dis_tance:"
+msgstr "দূরত্ব :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "অন্যান্য উইন্ডোর সাথে উইন্ডো আটক করা হবে"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "পর্দার প্রান্তের সাথে উইন্ডো আটক করা হবে"
+msgid "<i>Small</i>"
+msgstr "ক্ষুদ্র"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "আটক করুন"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "দূরত্ব :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "টাইটল বারের উপর দুবার ক্লিক করা হলে যে কর্ম সঞ্চালিত হবে :"
+msgid "<b>Windows snapping</b>"
+msgstr "উইন্ডো আটক করা"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "উইন্ডোর শিরোনাম, মুছে ফেলা সম্ভব নয়"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "পর্দার প্রান্তে পয়েন্টার পৌছে গেলে কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "শিরোনাম"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "পর্দার থেকে উইন্ডো টেনে সরিয়ে ফেলার সময় কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "পর্দার প্রান্তে পয়েন্টার পৌছে গেলে কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+msgid "Hide content of windows when _resizing"
+msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "উজ্জ্বল করা উইন্ডো বড় করার পূর্ববর্তী বিরামকাল :"
+msgid "Hide content of windows when _moving"
+msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "উজ্জ্বল"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "টাইটল বারের উপর দুবার ক্লিক করা হলে যে কর্ম সঞ্চালিত হবে :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "দুবার ক্লিক করার কর্ম"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "বিন্যাশ"
+msgid "Ad_vanced"
+msgstr "উন্নত"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -727,48 +726,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "বাঁদিকের কর্মক্ষেত্রে উইন্ডো স্থানান্তর করুন"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "শর্টকাট নির্মাণ করুন"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "বাঁদিকের কর্মক্ষেত্রে উইন্ডো স্থানান্তর করুন"
+msgid "_Bring window on current workspace"
+msgstr "পরবর্তী কর্মক্ষেত্রে উইন্ডো স্থানান্তর করুন"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "কর্মক্ষেত্র ১-র মধ্যে উইন্ডো স্থানান্তর করুন"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -776,166 +777,172 @@ msgid "Do _nothing"
 msgstr "কিছু নেই"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "পর্দার প্রান্তে পয়েন্টার পৌছে গেলে কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "কর্মক্ষেত্র ১-র মধ্যে উইন্ডো স্থানান্তর করুন"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "কর্মক্ষেত্র"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "পর্দার প্রান্তে পয়েন্টার পৌছে গেলে কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "পরবর্তী কর্মক্ষেত্রে উইন্ডো স্থানান্তর করুন"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "উইন্ডোর মাপ পরিবর্তনের সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "উইন্ডো সরানোর সময় তার মধ্যেকার বিষয়বস্তু প্রদর্শন করা হবে"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "কর্মক্ষেত্র"
+msgid "C_ompositor"
+msgstr "শর্টকাট নির্মাণ করুন"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "প্রান্তরেখা"
+msgid "_Number of workspaces:"
+msgstr "কর্মক্ষেত্রের সংখ্যা:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+msgid "Names"
+msgstr "নাম:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "পর্দার চারপাশে প্রান্তরেখার অঞ্চলে কোনো উইন্ডো স্থাপিত হবে না"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "কর্মক্ষেত্রের সংখ্যা:"
+msgid "_Margins"
+msgstr "প্রান্তরেখা"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -943,36 +950,36 @@ msgstr "কর্মক্ষেত্রের সংখ্যা:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "উইন্ডো পরিচালন ব্যবস্থা"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1116,6 +1123,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "কর্মক্ষেত্রের সংখ্যা:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "প্রান্তরেখা"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "কর্মক্ষেত্র গুটিয়ে ফেলা হবে"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "কর্মক্ষেত্রের নাম"
 
@@ -1227,10 +1246,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "নাম পরিবর্তন করুন"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "নাম:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "কর্মক্ষেত্র সম্পাদনার জন্য প্রথমে সেটির উপর ক্লিক করুন"
 
@@ -1250,10 +1265,6 @@ msgstr ""
 #~ msgstr "কর্মক্ষেত্র ও প্রান্তরেখা"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "প্রান্তরেখা"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "উইন্ডো পরিচালন ব্যবস্থা"
 
diff --git a/po/ca.po b/po/ca.po
index c67877b..54dfcb9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,22 +2,22 @@
 # Window manager for Xfce desktop environment.
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
-# 
+#
 # Carles Muñoz Gorriz <carlesmu at internautas.org> 2003-2004, 2006, 2008-2011.
 # Pau Ruŀlan Ferragut <paurullan at bulma.net> 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-06 14:06+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-12-06 21:28+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan <xfce-i18n at xfce.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -88,241 +88,241 @@ msgid "Settings manager socket"
 msgstr "Sòcol del gestor d'ajustaments"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configura el comportament de les finestres i de les dreceres"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestor de finestres"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ajusta el comportament i els efectes de les finestres"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configura el comportament de les finestres i de les dreceres"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ajustaments avançats del gestor de finestres"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Fixa el nombre i noms dels espais de treball"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ajusta el comportament i els efectes de les finestres"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Espais de treball"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Moure i redimensionar finestres</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Disseny dels botons</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Acció del doble clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Tipus d'enfocament</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Font del _títol</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Enfocament de les finestres noves</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Alineació del títol</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Primer pla al pitjar</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Pitgeu i arrossegueu els botons per canviar el disseny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Primer pla al enfocar</b>"
+msgid "Title"
+msgstr "Títol"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Alineació del títol</b>"
+msgid "The window title cannot be removed"
+msgstr "El títol de la finestra no es pot treure"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Font del _títol</b>"
+msgid "Active"
+msgstr "Actiu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>_Dreceres de la finestra</b>"
+msgid "Menu"
+msgstr "Menú"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Alineació de les finestres</b>"
+msgid "Stick"
+msgstr "Omnipresent"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Ajustament dels espais de treball</b>"
+msgid "Shade"
+msgstr "Enrotlla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimitza"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximitza"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Llarg</i>"
+msgid "Close"
+msgstr "Tanca"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ocult"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Curt</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Disseny dels botons</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Petita</i>"
+msgid "_Reset to Defaults"
+msgstr "_Torna als valors per defecte"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>_Dreceres de la finestra</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Forta</i>"
+msgid "Ke_yboard"
+msgstr "_Teclat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Actiu"
+msgid "Clic_k to focus"
+msgstr "S'enfoca al _pitjar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vançat"
+msgid "Focus follows _mouse"
+msgstr "L'enfocament segueix el _ratolí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Posa en _primer pla automàticament les finestres enfocades"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Enfoca automàticament les finestres _noves"
+msgid "_Delay before window receives focus:"
+msgstr "Retar_d abans que la finestra guanyi l'enfocament:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "S'enfoca al _pitjar"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Pitgeu i arrossegueu els botons per canviar el disseny"
+msgid "<i>Short</i>"
+msgstr "<i>Curt</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Tanca"
+msgid "<i>Long</i>"
+msgstr "<i>Llarg</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Tipus d'enfocament</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Retard a_bans de posar en primer pla la finestra enfocada:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Enfoca automàticament les finestres _noves"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tància:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Enfocament de les finestres noves</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "L'enfocament segueix el _ratolí"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Posa en _primer pla automàticament les finestres enfocades"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ocult"
+msgid "Delay _before raising focused window:"
+msgstr "Retard a_bans de posar en primer pla la finestra enfocada:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Amaga el contingut de les finestres quan es _moguin"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Primer pla al enfocar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Amaga el contingut de les finestres quan es _redimensionin"
+msgid "Raise window when clicking _inside application window"
+msgstr ""
+"Posa en primer pla la finestra quan es p_itgi dins la finestra de l'aplicació"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Teclat"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Primer pla al pitjar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximitza"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "En_focament"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menú"
+msgid "Snap windows to screen _border"
+msgstr "Alinea les finestres a la _vora de la pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimitza"
+msgid "Snap windows to other _windows"
+msgstr "Alinea les finestres amb les altres _finestres"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-"Posa en primer pla la finestra quan es p_itgi dins la finestra de l'aplicació"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrotlla"
+msgid "Dis_tance:"
+msgstr "Dis_tància:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Alinea les finestres amb les altres _finestres"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Alinea les finestres a la _vora de la pantalla"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Petita</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Omnipresent"
+msgid "<i>Wide</i>"
+msgstr "<i>Forta</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Acció quan es fa doble clic a la barra de títol"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Alineació de les finestres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "El títol de la finestra no es pot treure"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Canvia d'espai de treball quan el _punter arribi a un dels laterals de la "
+"pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Títol"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Canvia d'espai de treball quan s'_arrossegui una finestra fora de la pantalla"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Resistència de les _vores:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Ajustament dels espais de treball</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Canvia d'espai de treball quan el _punter arribi a un dels laterals de la "
-"pantalla"
+msgid "Hide content of windows when _resizing"
+msgstr "Amaga el contingut de les finestres quan es _redimensionin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Retar_d abans que la finestra guanyi l'enfocament:"
+msgid "Hide content of windows when _moving"
+msgstr "Amaga el contingut de les finestres quan es _moguin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Resistència de les _vores:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Moure i redimensionar finestres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "En_focament"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Acció quan es fa doble clic a la barra de títol"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Torna als valors per defecte"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Acció del doble clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stil"
+msgid "Ad_vanced"
+msgstr "A_vançat"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -660,208 +660,218 @@ msgstr ""
 "Això reiniciarà totes les dreceres als seus valors per defecte. És el que "
 "voleu fer?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Gran</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opac</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Omet les finestres que tenen activades les propietats\n"
+"«omet el paginador» o «omet la barra de tasques»"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Inclou les finestres amagades (i.e. les iconificades)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparent</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Rota en_tre les finestres de tots els espais de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activa la prevenció de furt d'en_focament"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Dibuixa el marc al voltant de les finestres seleccionades al rotar-les"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Al _centre de la pantalla"
+msgid "C_ycling"
+msgstr "_Rotació"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Per defecte, posa les finestres:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activa la prevenció de furt d'en_focament"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "«C_ompositor»"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Fes cas de la senyal e_standard d'enfocament ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Rotació"
+msgid "When a window raises itself:"
+msgstr "Quan una finestra s’alça:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Rota en_tre les finestres de tots els espais de treball"
+msgid "_Bring window on current workspace"
+msgstr "_Porta la finestra a l'actual espai de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Mostra directament a pantalla sencera les _finestres"
+msgid "Switch to win_dow's workspace"
+msgstr "Canvia a l'espai de treball de la fines_tra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_No fessis res"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Amaga el _marc de les finestres al maximitzar-les"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla emprada per arrosse_gar i moure finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Fes cas de la senyal e_standard d'enfocament ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Posa en p_rimer pla quan es pitgi qualsevol botó del ratolí"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Manté les finestres urgents fent _pampallugues"
+msgid "Hide _frame of windows when maximized"
+msgstr "Amaga el _marc de les finestres al maximitzar-les"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla emprada per arrosse_gar i moure finestres:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Recupera la _mida original de les finestres maximitzades quan es mouen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Empra resistència a les _vores en lloc de l'alineació de les finestres"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
 msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 "Notifica l'_urgència fent que la decoració de la finestra fassi pampallugues"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_tat de la decoració de les finestres:"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacitat de les finestres _inactives:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Manté les finestres urgents fent _pampallugues"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacitat de les finestres emergent_s:"
+msgid "_Accessibility"
+msgstr "_Accesibilitat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacitat de les finestres al _moure-les:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Empra la roda del _ratolí a l'escriptori per canviar d'espai de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacitat de les finestres al re_dimensionar-les:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Recupera la _mida original de les finestres maximitzades quan es mouen"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Recorda i recrida l'espai de treball previ\n"
+"quan canvii mitjançant les dreceres de teclat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostra ombres a les finestres ancora_des"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Canvia d'espai de treball en funció del _format actual de l'escriptori"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostra ombres a les finestres no_rmals"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Canvia d'espai de treball quan s'arribi al _primer o últim"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostra ombres a les finestres _emergents"
+msgid "_Workspaces"
+msgstr "_Espais de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Canvia a l'espai de treball de la fines_tra"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sota el _punter del ratolí"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Empra resistència a les _vores en lloc de l'alineació de les finestres"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Empra la roda del _ratolí a l'escriptori per canviar d'espai de treball"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Mida _mínima de les finestres per emplaçar-les inteŀligentment:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Quan una finestra s’alça:"
+msgid "<i>Large</i>"
+msgstr "<i>Gran</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Per defecte, posa les finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Canvia d'espai de treball en funció del _format actual de l'escriptori"
+msgid "At the _center of the screen"
+msgstr "Al _centre de la pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Canvia d'espai de treball quan s'arribi al _primer o últim"
+msgid "Under the mouse _pointer"
+msgstr "Sota el _punter del ratolí"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accesibilitat"
+msgid "_Placement"
+msgstr "_Posicionament"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Porta la finestra a l'actual espai de treball"
+msgid "_Enable display compositing"
+msgstr "_Habilita el «composite»"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
-"_Dibuixa el marc al voltant de les finestres seleccionades al rotar-les"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Mostra directament a pantalla sencera les _finestres"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Habilita el «composite»"
+msgid "Show shadows under _regular windows"
+msgstr "Mostra ombres a les finestres no_rmals"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostra ombres a les finestres _emergents"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Inclou les finestres amagades (i.e. les iconificades)"
+msgid "Show shadows under _dock windows"
+msgstr "Mostra ombres a les finestres ancora_des"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Mida _mínima de les finestres per emplaçar-les inteŀligentment:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_tat de la decoració de les finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Posicionament"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparent</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Posa en p_rimer pla quan es pitgi qualsevol botó del ratolí"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opac</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Recorda i recrida l'espai de treball previ\n"
-"quan canvii mitjançant les dreceres de teclat"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacitat de les finestres _inactives:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacitat de les finestres al _moure-les:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Omet les finestres que tenen activades les propietats\n"
-"«omet el paginador» o «omet la barra de tasques»"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacitat de les finestres al re_dimensionar-les:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacitat de les finestres emergent_s:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Espais de treball"
+msgid "C_ompositor"
+msgstr "«C_ompositor»"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marges</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Nombre d'espais de treball:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Espais de treball</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nom:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Els marges són uns espais a les vores de la pantalla on no s'emplaçarà cap "
 "finestra"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Nombre d'espais de treball:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Marges"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -869,35 +879,35 @@ msgstr "_Nombre d'espais de treball:"
 msgid "%s (on %s)"
 msgstr "%s (a %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Executar-se com a procés de fons"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Executar-se com a procés de fons (no suportat)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Estableix el mode «composite»"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Estableix el mode «composite» (no suportat)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Reemplaça el gestor de finestres existent"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Mostrar informació de la versió i sortir"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[PARÀMETRES...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Escriviu «%s --help» per a obtenir ajuda"
@@ -1030,6 +1040,15 @@ msgstr "Error al llegir dades del procés fill: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "No s'ha pogut crear la finestra d'ajuda: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Fixa el nombre i noms dels espais de treball"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Marges</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Espais de treball</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Canvia el nom de l'espai de treball"
 
@@ -1225,9 +1244,6 @@ msgstr "No s'ha pogut crear la finestra d'ajuda: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Canvia el nom"
 
-#~ msgid "Name:"
-#~ msgstr "Nom:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Pitjeu en el nom de l'espai de treball per editar-lo"
 
@@ -1245,9 +1261,6 @@ msgstr "No s'ha pogut crear la finestra d'ajuda: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Espais de treball i marges"
 
-#~ msgid "Margins"
-#~ msgstr "Marges"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Paràmetres del gestor de finestres"
 
diff --git a/po/cs.po b/po/cs.po
index ef186d4..070a5c0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-19 00:42+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-02-19 02:26+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -84,237 +84,237 @@ msgid "Settings manager socket"
 msgstr "Soket správce nastavení"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfigurace chování okna a klávesových zkratek"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Správce oken"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Doladění chování okna a efektů"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfigurace chování okna a klávesových zkratek"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Vyladění správce oken"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Nastavte počet a názvy pracovních ploch"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Doladění chování okna a efektů"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Pracovní plochy"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Vykreslování okna při přesunu a změně velikosti</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Rozmístění tlačítek</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Akce při _dvojitém kliknutí</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>Moti_v</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Způsob zaměření</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Písmo _titulku</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Zaměřování nových oken</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Za_rovnání titulku</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Přenést do popředí při kliknutí</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Pro změnu rozvržení přemístěte tlačítka přetažením myší."
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Přenést do popředí při zaměření</b>"
+msgid "Title"
+msgstr "Titulek"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Za_rovnání titulku</b>"
+msgid "The window title cannot be removed"
+msgstr "Titulek okna nelze odstranit"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Písmo _titulku</b>"
+msgid "Active"
+msgstr "Aktivní"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Klá_vesové zkratky správce oken</b>"
+msgid "Menu"
+msgstr "Nabídka"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Přichytávání oken</b>"
+msgid "Stick"
+msgstr "Přilepit"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Přecházení mezi plochami</b>"
+msgid "Shade"
+msgstr "Zarolovat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>Moti_v</b>"
+msgid "Minimize"
+msgstr "Minimalizovat"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximalizovat"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Dlouhá</i>"
+msgid "Close"
+msgstr "Zavřít"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Skrytá"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Krátká</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Rozmístění tlačítek</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Styl"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Malá</i>"
+msgid "_Reset to Defaults"
+msgstr "_Obnovit výchozí"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Klá_vesové zkratky správce oken</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Široká</i>"
+msgid "Ke_yboard"
+msgstr "_Klávesnice"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktivní"
+msgid "Clic_k to focus"
+msgstr "K_liknout pro zaměření"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Pokročilé"
+msgid "Focus follows _mouse"
+msgstr "Zaměřit _umístěním kurzoru myši nad okno"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Po zaměření _automaticky přenést okno do popředí"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Au_tomaticky zaměřovat nově vytvořená okna"
+msgid "_Delay before window receives focus:"
+msgstr "Zpoždění př_ed přesunutím okna do popředí"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "K_liknout pro zaměření"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Pro změnu rozvržení přemístěte tlačítka přetažením myší."
+msgid "<i>Short</i>"
+msgstr "<i>Krátká</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Zavřít"
+msgid "<i>Long</i>"
+msgstr "<i>Dlouhá</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Způsob zaměření</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Zp_oždění před přesunutím zaměřeného okna do popředí"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Au_tomaticky zaměřovat nově vytvořená okna"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Přilnavos_t:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Zaměřování nových oken</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Zaměřit _umístěním kurzoru myši nad okno"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Po zaměření _automaticky přenést okno do popředí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Skrytá"
+msgid "Delay _before raising focused window:"
+msgstr "Zp_oždění před přesunutím zaměřeného okna do popředí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Nezo_brazovat obsah okna při přesunu"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Přenést do popředí při zaměření</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "N_ezobrazovat obsah okna při změně velikosti"
+msgid "Raise window when clicking _inside application window"
+msgstr "Přenést okno _do popředí při kliknutí do okna aplikace"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Klávesnice"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Přenést do popředí při kliknutí</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximalizovat"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "Za_měření"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Nabídka"
+msgid "Snap windows to screen _border"
+msgstr "Přic_hytávat okna k okrajům obrazovky"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimalizovat"
+msgid "Snap windows to other _windows"
+msgstr "Při_chytávat okna k jiným oknům"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Přenést okno _do popředí při kliknutí do okna aplikace"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Zarolovat"
+msgid "Dis_tance:"
+msgstr "Přilnavos_t:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Při_chytávat okna k jiným oknům"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Přic_hytávat okna k okrajům obrazovky"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Malá</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Přilepit"
+msgid "<i>Wide</i>"
+msgstr "<i>Široká</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Akce při dvojitém kliknutí na titulkový pruh"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Přichytávání oken</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Titulek okna nelze odstranit"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Přejít na vedlejší plochu při _ukázání kurzorem myši k okraji plochy"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titulek"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Přejít na _vedlejší plochu při přetáhnutí okna mimo oblast obrazovky"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Odolnost okrajů:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Přecházení mezi plochami</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Přejít na vedlejší plochu při _ukázání kurzorem myši k okraji plochy"
+msgid "Hide content of windows when _resizing"
+msgstr "N_ezobrazovat obsah okna při změně velikosti"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Zpoždění př_ed přesunutím okna do popředí"
+msgid "Hide content of windows when _moving"
+msgstr "Nezo_brazovat obsah okna při přesunu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Odolnost okrajů:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Vykreslování okna při přesunu a změně velikosti</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "Za_měření"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Akce při dvojitém kliknutí na titulkový pruh"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Obnovit výchozí"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Akce při _dvojitém kliknutí</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Styl"
+msgid "Ad_vanced"
+msgstr "_Pokročilé"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -645,205 +645,222 @@ msgid "Reset to Defaults"
 msgstr "Obnovit výchozí"
 
 #: ../settings-dialogs/xfwm4-settings.c:1893
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Touto akcí nastavíte všechny klávesové zkratky na výchozí hodnoty. Chcete pokračovat?"
-
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Velká</i>"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Touto akcí nastavíte všechny klávesové zkratky na výchozí hodnoty. Chcete "
+"pokračovat?"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Neprůhledné</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Př_eskočit okna s nastavenou vlastností\n"
+"\"vynechat v přepínači ploch\" nebo \"vynechat v panelu úloh\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Zahrnou_t skrytá (minimalizovaná) okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Průhledné</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Pr_ocházet okna ze všech pracovních ploch"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Pře_dejít ztrátě zaměření okna"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Vykreslovat kolem oken rámeček při procházení"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Dopros_třed obrazovky"
+msgid "C_ycling"
+msgstr "P_rocházení"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Výchozí umisťování oken:"
+msgid "Activate _focus stealing prevention"
+msgstr "Pře_dejít ztrátě zaměření okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Kompozitor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Dodržovat standardní _ICCCM focus hint"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "P_rocházení"
+msgid "When a window raises itself:"
+msgstr "Po samovolném přemístění okna do popředí:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Pr_ocházet okna ze všech pracovních ploch"
+msgid "_Bring window on current workspace"
+msgstr "Přesunou_t okno na aktuální pracovní plochu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Použít přímé zobrazo_vání pro okna v režimu celá obrazovka"
+msgid "Switch to win_dow's workspace"
+msgstr "Př_epnout se na pracovní plochu okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Žádná _akce"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Při ma_ximalizaci skrýt okraje okna"
+msgid "Key used to _grab and move windows:"
+msgstr "Klá_vesa pro uchopení a přesun oken"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Dodržovat standardní _ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Přenés_t okno do popředí po stisknutí libovolného tlačítka myši"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Zachovat _blikání u okna s příznakem urgent"
+msgid "Hide _frame of windows when maximized"
+msgstr "Při ma_ximalizaci skrýt okraje okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Klá_vesa pro uchopení a přesun oken"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Při přesunu _obnovit původní velikost u maximalizovaných oken"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Upozornit n_a příznak urgent blikáním dekorace okna"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Použít odolnost okrajů namísto př_ichytávání oken"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Průhlednost _dekorací oken"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Upozornit n_a příznak urgent blikáním dekorace okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Prů_hlednost neaktivních oken"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Zachovat _blikání u okna s příznakem urgent"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Průhlednost _vyskakovacích oken"
+msgid "_Accessibility"
+msgstr "Pří_stupnost"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Průhl_ednost oken při přesunu"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "P_oužít kolečko myši na pracovní ploše pro přepínání ploch"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Průh_lednost oken při změně velikosti"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Při přesunu _obnovit původní velikost u maximalizovaných oken"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Z_apamatovat si a znovu vyvolat předchozí plochu\n"
+"při přepínání klávesovými zkratkami"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Zobrazova_t stíny pod dokovacími okny"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Přec_házet na plochy podle jejich aktuálního rozmístění"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Zobrazovat stíny pod _běžnými okny"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Přecházet při dosažení první nebo poslední pracovní plochy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Zobr_azovat stíny pod vyskakovacími okny"
+msgid "_Workspaces"
+msgstr "Pra_covní plochy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Př_epnout se na pracovní plochu okna"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Po_d ukazatelem myši"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Použít odolnost okrajů namísto př_ichytávání oken"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "P_oužít kolečko myši na pracovní ploše pro přepínání ploch"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Nejmenší _velikost oken pro použití chytrého umístění"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Po samovolném přemístění okna do popředí:"
+msgid "<i>Large</i>"
+msgstr "<i>Velká</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Výchozí umisťování oken:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Přec_házet na plochy podle jejich aktuálního rozmístění"
+msgid "At the _center of the screen"
+msgstr "Dopros_třed obrazovky"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Přecházet při dosažení první nebo poslední pracovní plochy"
+msgid "Under the mouse _pointer"
+msgstr "Po_d ukazatelem myši"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Pří_stupnost"
+msgid "_Placement"
+msgstr "_Umisťování"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Přesunou_t okno na aktuální pracovní plochu"
+msgid "_Enable display compositing"
+msgstr "P_oužívat kompozitor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Vykreslovat kolem oken rámeček při procházení"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Použít přímé zobrazo_vání pro okna v režimu celá obrazovka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "P_oužívat kompozitor"
+msgid "Show shadows under _regular windows"
+msgstr "Zobrazovat stíny pod _běžnými okny"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Zobr_azovat stíny pod vyskakovacími okny"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Zahrnou_t skrytá (minimalizovaná) okna"
+msgid "Show shadows under _dock windows"
+msgstr "Zobrazova_t stíny pod dokovacími okny"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Nejmenší _velikost oken pro použití chytrého umístění"
+msgid "Opaci_ty of window decorations:"
+msgstr "Průhlednost _dekorací oken"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Umisťování"
+msgid "<i>Transparent</i>"
+msgstr "<i>Průhledné</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Přenés_t okno do popředí po stisknutí libovolného tlačítka myši"
+msgid "<i>Opaque</i>"
+msgstr "<i>Neprůhledné</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Z_apamatovat si a znovu vyvolat předchozí plochu\n"
-"při přepínání klávesovými zkratkami"
+msgid "Opacity of _inactive windows:"
+msgstr "Prů_hlednost neaktivních oken"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Průhl_ednost oken při přesunu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Př_eskočit okna s nastavenou vlastností\n"
-"\"vynechat v přepínači ploch\" nebo \"vynechat v panelu úloh\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Průh_lednost oken při změně velikosti"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Průhlednost _vyskakovacích oken"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Pra_covní plochy"
+msgid "C_ompositor"
+msgstr "_Kompozitor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Okraje</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Poče_t pracovních ploch:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Pracovní plochy</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-msgid "Margins are areas on the edges of the screen where no window will be placed"
-msgstr "Okraje ploch jsou místa po stranách obrazovky, kam nemohou být umístěna žádná okna"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Název:"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Poče_t pracovních ploch:"
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr ""
+"Okraje ploch jsou místa po stranách obrazovky, kam nemohou být umístěna "
+"žádná okna"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Okraje"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -851,35 +868,35 @@ msgstr "Poče_t pracovních ploch:"
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Přesunou do pozadí"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Přesunou do pozadí (nepodporováno)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Nastavit režim kompozitoru"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Nastavit režim kompozitoru (nepodporováno)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Nahradit stávající správce oken"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Zobrazí informace o verzi a ukončí se"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[PARAMETRY...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Informace o použití získáte příkazem \"%s --help\" ."
@@ -1011,6 +1028,15 @@ msgstr "Chyba při čtení dat z procesu potomka: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nelze otevřít dialogové okno helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Nastavte počet a názvy pracovních ploch"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Okraje</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Pracovní plochy</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Změnit název pracovní plochy"
 
@@ -1204,9 +1230,6 @@ msgstr "Nelze otevřít dialogové okno helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Změna názvu"
 
-#~ msgid "Name:"
-#~ msgstr "Název:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Název pracovní plochy upravíte kliknutím na něj"
 
@@ -1222,9 +1245,6 @@ msgstr "Nelze otevřít dialogové okno helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Pracovní plochy a okraje"
 
-#~ msgid "Margins"
-#~ msgstr "Okraje"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Nastavení správce oken"
 
diff --git a/po/da.po b/po/da.po
index 23477c8..19bd10d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm 4.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-16 02:30+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-12-15 13:53+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Danish\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -87,237 +87,237 @@ msgid "Settings manager socket"
 msgstr "Indstillingshåndtering for sokkel"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Indstil vindueopførsel og genveje"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Vindueshåndtering"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Fin-indstil vindueopførsel og effekter"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Indstil vindueopførsel og genveje"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Vindueshåndtering tweaks"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Indstil antal og navne for arbejdsområder"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Fin-indstil vindueopførsel og effekter"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Arbejdsområder"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Flyt boks og justér størrelse</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Knaplayout</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dobbeltklik-_handling</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokusmodel</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Titelskri_fttype</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus til nyt vindue</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Titel_justering</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Flyt frem ved klik</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klik og træk knapperne for at ændre layoutet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Flyt vindue frem ved fokus</b>"
+msgid "Title"
+msgstr "Titel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Titel_justering</b>"
+msgid "The window title cannot be removed"
+msgstr "Vinduestitlen kan ikke fjernes"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Titelskri_fttype</b>"
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Vindues_genveje</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Klæbning af vinduer</b>"
+msgid "Stick"
+msgstr "Klæb"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Fold arbejdsområder</b>"
+msgid "Shade"
+msgstr "Skygge"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimér"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimér"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lang</i>"
+msgid "Close"
+msgstr "Luk"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Skjult"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kort</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Knaplayout</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Lille</i>"
+msgid "_Reset to Defaults"
+msgstr "_Nulstil til standarder"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Vindues_genveje</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Bredde</i>"
+msgid "Ke_yboard"
+msgstr "Ta_statur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiv"
+msgid "Clic_k to focus"
+msgstr "Kli_k for fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Avan_ceret"
+msgid "Focus follows _mouse"
+msgstr "Fokus følger _musen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Flyt auto_matisk vinduer frem når de får fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Giv automatisk fokus til _nyligt oprettede vinduer"
+msgid "_Delay before window receives focus:"
+msgstr "_Forsinkelse før vinduet får fokus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kli_k for fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klik og træk knapperne for at ændre layoutet"
+msgid "<i>Short</i>"
+msgstr "<i>Kort</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Luk"
+msgid "<i>Long</i>"
+msgstr "<i>Lang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokusmodel</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Forsink _inden fremflytning af vinduer med fokus:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Giv automatisk fokus til _nyligt oprettede vinduer"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Af_stand:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus til nyt vindue</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus følger _musen"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Flyt auto_matisk vinduer frem når de får fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Skjult"
+msgid "Delay _before raising focused window:"
+msgstr "Forsink _inden fremflytning af vinduer med fokus:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Skjul indhold af vinduet under f_lytning"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Flyt vindue frem ved fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Skjul indhold af vinduer under æn_dring af størrelsen"
+msgid "Raise window when clicking _inside application window"
+msgstr "Flyt vindue frem når der klikkes _i applikationsvinduet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Ta_statur"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Flyt frem ved klik</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimér"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Klæb vinduer til skærmens _kant"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimér"
+msgid "Snap windows to other _windows"
+msgstr "Klæb vinduer til andre _vinduer"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Flyt vindue frem når der klikkes _i applikationsvinduet"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Skygge"
+msgid "Dis_tance:"
+msgstr "Af_stand:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Klæb vinduer til andre _vinduer"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Klæb vinduer til skærmens _kant"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Lille</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Klæb"
+msgid "<i>Wide</i>"
+msgstr "<i>Bredde</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Handlingen der udføres når der dobbelt-klikkes på titellinjen"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Klæbning af vinduer</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Vinduestitlen kan ikke fjernes"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Fold arbejdsområde når mar_køren når skærmens kant"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titel"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Fold arbejdsområde når et vindue _trækkes af skærmen"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Kant-modstand:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Fold arbejdsområder</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Fold arbejdsområde når mar_køren når skærmens kant"
+msgid "Hide content of windows when _resizing"
+msgstr "Skjul indhold af vinduer under æn_dring af størrelsen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Forsinkelse før vinduet får fokus:"
+msgid "Hide content of windows when _moving"
+msgstr "Skjul indhold af vinduet under f_lytning"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Kant-modstand:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Flyt boks og justér størrelse</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Handlingen der udføres når der dobbelt-klikkes på titellinjen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Nulstil til standarder"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dobbeltklik-_handling</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "Avan_ceret"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -655,205 +655,215 @@ msgstr ""
 "Dette vil nulstille alle genveje til deres standardværdier. Vil du virkelig "
 "gøre dette?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Stor</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Ugennemsigtig</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Udelad vinduer som har \"udelad skifter\"\n"
+"eller \"udelad opgaveliste\" egenskaben aktiveret"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "I_nkludér skjulte (det vil sige minimerede) vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Gennemsigtig</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Genne_mløb vinduer fra alle arbejdsområder"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktivér beskyttelse mod at f_okus stjæles"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Tegn en ramme omkring valgte vindue under gennemløb af vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "I _centrum af skærmen"
+msgid "C_ycling"
+msgstr "Gennem_løb"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Som standard, placér vinduer:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktivér beskyttelse mod at f_okus stjæles"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "Sammens_ætter"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Overhold _ICCCM-standardens fokusfif"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Gennem_løb"
+msgid "When a window raises itself:"
+msgstr "Når et vindue kommer til syne af sig selv:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Genne_mløb vinduer fra alle arbejdsområder"
+msgid "_Bring window on current workspace"
+msgstr "Fly_t vindue til aktivt arbejdsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Vis f_uldskærms-overlægsvinduer direkte"
+msgid "Switch to win_dow's workspace"
+msgstr "Skift til vin_duets arbejdsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Gør _ingenting"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Skjul ra_mme på vinduer når maksimeret"
+msgid "Key used to _grab and move windows:"
+msgstr "Tast som bruges til at ta_ge fat i og flytte vinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Overhold _ICCCM-standardens fokusfif"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Flyt vinduer forrest ved tryk på vilkårlig museknap"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Fasthold vigtige vinduer _blinkende"
+msgid "Hide _frame of windows when maximized"
+msgstr "Skjul ra_mme på vinduer når maksimeret"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tast som bruges til at ta_ge fat i og flytte vinduer:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Gendan oprindelig s_tørrelse af maksimeret vindue når det flyttes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Påmind om _vigtighed ved at lade vinduesdekorationen blinke"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Brug _kant-modstand i stedet for klæbende vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Uigennem_sigtighed af vinduesdekorationer:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Påmind om _vigtighed ved at lade vinduesdekorationen blinke"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Uigennemsigtighed af _inaktive vinduer:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Fasthold vigtige vinduer _blinkende"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Uigennemsigtighed af pop _op-vinduer:"
+msgid "_Accessibility"
+msgstr "Til_gængelighed"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Uigennemsigtighed af vinduer som _flyttes:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Brug muse_hjulet på skrivebord til at skifte arbejdsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Uigennemsigtighed mens vinduets størrelse æ_ndres:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Gendan oprindelig s_tørrelse af maksimeret vindue når det flyttes"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Husk og genkald foregående arbejdsområde\n"
+"når der skiftes via tastatur-genveje"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Vis skygger under d_ok-vinduer"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Fold arbejdsområder afhængig af det aktuelle skrivebords_layout"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Vis skygger under almi_ndelige vinduer"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Fold arbejdsområde når det første eller sidste _arbejdsområde nåes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Vis skygger under pop op-_vinduer"
+msgid "_Workspaces"
+msgstr "Ar_bejdsområder"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Skift til vin_duets arbejdsområde"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Under musem_arkøren"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Brug _kant-modstand i stedet for klæbende vinduer"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Brug muse_hjulet på skrivebord til at skifte arbejdsområde"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "M_indste størrelse af vinduer for at aktivere smart-placering:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Når et vindue kommer til syne af sig selv:"
+msgid "<i>Large</i>"
+msgstr "<i>Stor</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Som standard, placér vinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Fold arbejdsområder afhængig af det aktuelle skrivebords_layout"
+msgid "At the _center of the screen"
+msgstr "I _centrum af skærmen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Fold arbejdsområde når det første eller sidste _arbejdsområde nåes"
+msgid "Under the mouse _pointer"
+msgstr "Under musem_arkøren"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Til_gængelighed"
+msgid "_Placement"
+msgstr "P_lacering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Fly_t vindue til aktivt arbejdsområde"
+msgid "_Enable display compositing"
+msgstr "Ak_tivér skærmbilledesammensætning"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Tegn en ramme omkring valgte vindue under gennemløb af vinduer"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Vis f_uldskærms-overlægsvinduer direkte"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Ak_tivér skærmbilledesammensætning"
+msgid "Show shadows under _regular windows"
+msgstr "Vis skygger under almi_ndelige vinduer"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Vis skygger under pop op-_vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "I_nkludér skjulte (det vil sige minimerede) vinduer"
+msgid "Show shadows under _dock windows"
+msgstr "Vis skygger under d_ok-vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "M_indste størrelse af vinduer for at aktivere smart-placering:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Uigennem_sigtighed af vinduesdekorationer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "P_lacering"
+msgid "<i>Transparent</i>"
+msgstr "<i>Gennemsigtig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Flyt vinduer forrest ved tryk på vilkårlig museknap"
+msgid "<i>Opaque</i>"
+msgstr "<i>Ugennemsigtig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Husk og genkald foregående arbejdsområde\n"
-"når der skiftes via tastatur-genveje"
+msgid "Opacity of _inactive windows:"
+msgstr "Uigennemsigtighed af _inaktive vinduer:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Uigennemsigtighed af vinduer som _flyttes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Udelad vinduer som har \"udelad skifter\"\n"
-"eller \"udelad opgaveliste\" egenskaben aktiveret"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Uigennemsigtighed mens vinduets størrelse æ_ndres:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Uigennemsigtighed af pop _op-vinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Ar_bejdsområder"
+msgid "C_ompositor"
+msgstr "Sammens_ætter"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margener</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "A_ntal arbejdsområder:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Arbejdsområder</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Navn:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margener er de områder i kanten af skærmbilledet, hvor vinduer ikke vil "
 "blive placeret"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "A_ntal arbejdsområder:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margener</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -861,35 +871,35 @@ msgstr "A_ntal arbejdsområder:"
 msgid "%s (on %s)"
 msgstr "%s (på %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Forgren til baggrunden"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Forgren til baggrunden (ikke understøttet)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Indstil sammemsættertilstand"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Indstil sammemsættertilstand (ikke understøttet)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Erstat den nuværende vindueshåndtering"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTER...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Indtast \"%s --help\" for brugsvejledning."
@@ -1021,12 +1031,15 @@ msgstr "Fejl ved læsning af data fra underproces: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Kan ikke kalde hjælperdialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Indstil antal og navne for arbejdsområder"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Arbejdsområder</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Ændr arbejdsområdenavn"
 
-#~ msgid "_Name:"
-#~ msgstr "_Navn:"
-
 #~ msgid "Hide"
 #~ msgstr "Skjul"
 
diff --git a/po/de.po b/po/de.po
index 51f081c..85d574c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-29 07:18+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-03-29 11:37+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
 "Language-Team: German <xfce-i18n-de at xfce.org>\n"
@@ -71,7 +71,8 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Geben Sie »%s -- help« ein, um eine vollständige Liste verfügbarer Befehlszeilenoptionen zu sehen.\n"
+"Geben Sie »%s -- help« ein, um eine vollständige Liste verfügbarer "
+"Befehlszeilenoptionen zu sehen.\n"
 
 #: ../settings-dialogs/workspace-settings.c:73
 #: ../settings-dialogs/workspace-settings.c:88
@@ -89,237 +90,240 @@ msgid "Settings manager socket"
 msgstr "Socket für die Sitzungsverwaltung"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Passen Sie das Fensterverhalten und die Fenstertastenkürzel an"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Fensterverwaltung"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Nehmen Sie Feineinstellungen am Fensterverhalten und den Fenstereffekten vor"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Passen Sie das Fensterverhalten und die Fenstertastenkürzel an"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Feineinstellungen des Fensterverhaltens"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Stellen Sie Anzahl und Namen von Arbeitsflächen ein"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr ""
+"Nehmen Sie Feineinstellungen am Fensterverhalten und den Fenstereffekten vor"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Arbeitsflächen"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Bewegen und Vergrößern der Fensterbox</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Anordnung der Knöpfe</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Aktion bei _Doppelklick</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Thema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokuseinstellungen</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Sch_rift im Titel</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus bei neuen Fenstern</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>T_itelausrichtung</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Hervorheben durch Klicken</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Ziehen Sie die Knöpfe nach unten, um die Anordnung zu verändern"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Hervorheben bei Fokus</b>"
+msgid "Title"
+msgstr "Titelleiste"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>T_itelausrichtung</b>"
+msgid "The window title cannot be removed"
+msgstr "Der Fenstertitel kann nicht entfernt werden"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Sch_rift im Titel</b>"
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>T_astenkürzel für Fenster</b>"
+msgid "Menu"
+msgstr "Menü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Einrasten der Fenster</b>"
+msgid "Stick"
+msgstr "Anheften"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Arbeitsflächen wechseln</b>"
+msgid "Shade"
+msgstr "Einrollen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Thema</b>"
+msgid "Minimize"
+msgstr "Minimieren"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximieren"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lang</i>"
+msgid "Close"
+msgstr "Schließen"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Versteckt"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kurz</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Anordnung der Knöpfe</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Klein</i>"
+msgid "_Reset to Defaults"
+msgstr "Sta_ndardwerte setzen"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>T_astenkürzel für Fenster</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Breit</i>"
+msgid "Ke_yboard"
+msgstr "_Tastatur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiv"
+msgid "Clic_k to focus"
+msgstr "Fokus durch _Mausklick"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Weitere Optionen"
+msgid "Focus follows _mouse"
+msgstr "Fokus folgt M_auszeiger"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Fenster in den Vordergrund _bringen, wenn sie den Fokus erhalten"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "_Neue Fenster erhalten Fokus automatisch"
+msgid "_Delay before window receives focus:"
+msgstr "_Dauer, bis ein Fenster den Fokus erhält:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Fokus durch _Mausklick"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Ziehen Sie die Knöpfe nach unten, um die Anordnung zu verändern"
+msgid "<i>Short</i>"
+msgstr "<i>Kurz</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Schließen"
+msgid "<i>Long</i>"
+msgstr "<i>Lang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokuseinstellungen</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Da_uer, bis ein Fenster in den Vordergrund gebracht wird:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "_Neue Fenster erhalten Fokus automatisch"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Abstand:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus bei neuen Fenstern</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus folgt M_auszeiger"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Fenster in den Vordergrund _bringen, wenn sie den Fokus erhalten"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Versteckt"
+msgid "Delay _before raising focused window:"
+msgstr "Da_uer, bis ein Fenster in den Vordergrund gebracht wird:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Inhalt beim _Verschieben verbergen"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Hervorheben bei Fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Inhalt bei _Größenänderung verbergen"
+msgid "Raise window when clicking _inside application window"
+msgstr "H_ervorheben bei Klick in das Programmfenster"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Tastatur"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Hervorheben durch Klicken</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximieren"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "F_okus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menü"
+msgid "Snap windows to screen _border"
+msgstr "F_enster am Seitenrand einrasten lassen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimieren"
+msgid "Snap windows to other _windows"
+msgstr "Fe_nster an anderen Fenstern einrasten lassen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "H_ervorheben bei Klick in das Programmfenster"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Einrollen"
+msgid "Dis_tance:"
+msgstr "_Abstand:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Fe_nster an anderen Fenstern einrasten lassen"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "F_enster am Seitenrand einrasten lassen"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Klein</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Anheften"
+msgid "<i>Wide</i>"
+msgstr "<i>Breit</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Aktion, die bei Doppelklick auf die Titelleiste ausgeführt wird"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Einrasten der Fenster</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Der Fenstertitel kann nicht entfernt werden"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Ar_beitsfläche wechseln, wenn der Mauszeiger den Bildschirmrand erreicht"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titelleiste"
+msgid "Wrap workspaces when _dragging a window off the screen"
+msgstr ""
+"A_rbeitsfläche wechseln, wenn ein Fenster aus dem Sichtfeld gezogen wird"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "W_iderstand an den Kanten:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-msgid "Wrap workspaces when _dragging a window off the screen"
-msgstr "A_rbeitsfläche wechseln, wenn ein Fenster aus dem Sichtfeld gezogen wird"
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Arbeitsflächen wechseln</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Ar_beitsfläche wechseln, wenn der Mauszeiger den Bildschirmrand erreicht"
+msgid "Hide content of windows when _resizing"
+msgstr "Inhalt bei _Größenänderung verbergen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Dauer, bis ein Fenster den Fokus erhält:"
+msgid "Hide content of windows when _moving"
+msgstr "Inhalt beim _Verschieben verbergen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "W_iderstand an den Kanten:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Bewegen und Vergrößern der Fensterbox</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "F_okus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Aktion, die bei Doppelklick auf die Titelleiste ausgeführt wird"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Sta_ndardwerte setzen"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Aktion bei _Doppelklick</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "_Weitere Optionen"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -654,201 +658,228 @@ msgid "Reset to Defaults"
 msgstr "Standardwerte setzen"
 
 #: ../settings-dialogs/xfwm4-settings.c:1893
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Dies wird alle Tastenkürzel auf ihre Standardwerte zurücksetzen. Möchten Sie dies wirklich?"
-
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Groß</i>"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Dies wird alle Tastenkürzel auf ihre Standardwerte zurücksetzen. Möchten Sie "
+"dies wirklich?"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Undurchsichtig</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"F_enster, die nicht im Arbeitsflächenumschalter oder nicht in der Taskleiste "
+"erscheinen sollen, auch wirklich übergehen."
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Versteckte (z.B. minimierte) Fenster miteinbeziehen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Durchsichtig</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Fe_nster aller Arbeitsflächen miteinbeziehen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Fo_kusverlust verhindern"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Rahmen um die ausgewählten Fenster zeichnen während des Fensterwechsels"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "I_n der Mitte des Bildschirms"
+msgid "C_ycling"
+msgstr "_Fensterwechsel"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Standardmäßig die Fenster folgendermaßen platzieren:"
+msgid "Activate _focus stealing prevention"
+msgstr "Fo_kusverlust verhindern"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "Co_mpositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "_Den normalen ICCCM-Fokus-Hinweis berücksichtigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Fensterwechsel"
+msgid "When a window raises itself:"
+msgstr "Wenn sich ein Fenster hervorhebt:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Fe_nster aller Arbeitsflächen miteinbeziehen"
+msgid "_Bring window on current workspace"
+msgstr "F_enster auf die aktuelle Arbeitsfläche verschieben"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "_Vollbildfenster mit Overlay sofort anzeigen"
+msgid "Switch to win_dow's workspace"
+msgstr "Zu_r Arbeitsfläche des Fensters wechseln"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Nichts unternehmen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "_Rahmen bei maximierten Fenstern nicht anzeigen"
+msgid "Key used to _grab and move windows:"
+msgstr "_Taste zum Verschieben der Fenster:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "_Den normalen ICCCM-Fokus-Hinweis berücksichtigen"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "F_enster hervorbringen, wenn eine beliebige Maustaste gedrückt wird"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Dr_ingende Fenster ununterbrochen in blinkendem Zustand lassen"
+msgid "Hide _frame of windows when maximized"
+msgstr "_Rahmen bei maximierten Fenstern nicht anzeigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "_Taste zum Verschieben der Fenster:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Ur_sprüngliche Größe maximierter Fenster nach Verschieben wiederherstellen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "_Dringlichkeit mitteilen, indem der Fensterrahmen blinkt"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "_Widerstand an den Kanten, statt die Fenster einrasten zu lassen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "_Deckkraft der Fensterdekoration:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "_Dringlichkeit mitteilen, indem der Fensterrahmen blinkt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Dec_kkraft von inaktiven Fenstern:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Dr_ingende Fenster ununterbrochen in blinkendem Zustand lassen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Deckkraft von P_opup-Fenstern:"
+msgid "_Accessibility"
+msgstr "Z_ugreifbarkeit"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Deckk_raft beim Verschieben:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"B_etätigung des Mausrads über der Arbeitsoberfläche zum Wechseln der "
+"Arbeitsfläche"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Deckkraft bei _Größenänderung:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Ur_sprüngliche Größe maximierter Fenster nach Verschieben wiederherstellen"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Vorige Arbeitsfläche merken und wieder verwenden beim Wechseln mittels "
+"Tastenkürzeln"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Schatt_en unter Leisten anzeigen"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "A_rbeitsflächen in Abhängigkeit der derzeitigen Anordnung umbrechen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "_Schatten unter normalen Fenstern anzeigen"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Arbe_itsflächen umbrechen, wenn die erste oder letzte Arbeitsfläche erreicht "
+"wird."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Scha_tten unter Popup-Fenstern anzeigen"
+msgid "_Workspaces"
+msgstr "_Arbeitsflächen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Zu_r Arbeitsfläche des Fensters wechseln"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Un_terhalb des Mauszeigers"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "_Widerstand an den Kanten, statt die Fenster einrasten zu lassen"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "B_etätigung des Mausrads über der Arbeitsoberfläche zum Wechseln der Arbeitsfläche"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "M_indestgröße zur intelligenten Fensterplatzierung:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Wenn sich ein Fenster hervorhebt:"
+msgid "<i>Large</i>"
+msgstr "<i>Groß</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Standardmäßig die Fenster folgendermaßen platzieren:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "A_rbeitsflächen in Abhängigkeit der derzeitigen Anordnung umbrechen"
+msgid "At the _center of the screen"
+msgstr "I_n der Mitte des Bildschirms"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Arbe_itsflächen umbrechen, wenn die erste oder letzte Arbeitsfläche erreicht wird."
+msgid "Under the mouse _pointer"
+msgstr "Un_terhalb des Mauszeigers"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Z_ugreifbarkeit"
+msgid "_Placement"
+msgstr "_Platzierung"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "F_enster auf die aktuelle Arbeitsfläche verschieben"
+msgid "_Enable display compositing"
+msgstr "A_nzeigen-Compositing aktivieren"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Rahmen um die ausgewählten Fenster zeichnen während des Fensterwechsels"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "_Vollbildfenster mit Overlay sofort anzeigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "A_nzeigen-Compositing aktivieren"
+msgid "Show shadows under _regular windows"
+msgstr "_Schatten unter normalen Fenstern anzeigen"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Scha_tten unter Popup-Fenstern anzeigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Versteckte (z.B. minimierte) Fenster miteinbeziehen"
+msgid "Show shadows under _dock windows"
+msgstr "Schatt_en unter Leisten anzeigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "M_indestgröße zur intelligenten Fensterplatzierung:"
+msgid "Opaci_ty of window decorations:"
+msgstr "_Deckkraft der Fensterdekoration:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Platzierung"
+msgid "<i>Transparent</i>"
+msgstr "<i>Durchsichtig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "F_enster hervorbringen, wenn eine beliebige Maustaste gedrückt wird"
+msgid "<i>Opaque</i>"
+msgstr "<i>Undurchsichtig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr "_Vorige Arbeitsfläche merken und wieder verwenden beim Wechseln mittels Tastenkürzeln"
+msgid "Opacity of _inactive windows:"
+msgstr "Dec_kkraft von inaktiven Fenstern:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Deckk_raft beim Verschieben:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "F_enster, die nicht im Arbeitsflächenumschalter oder nicht in der Taskleiste erscheinen sollen, auch wirklich übergehen."
+msgid "Opacity of windows during resi_ze:"
+msgstr "Deckkraft bei _Größenänderung:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Deckkraft von P_opup-Fenstern:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Arbeitsflächen"
+msgid "C_ompositor"
+msgstr "Co_mpositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Seitenränder</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Anzahl der Arbeitsflächen:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Arbeitsflächen</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-msgid "Margins are areas on the edges of the screen where no window will be placed"
-msgstr "Hiermit kann man Ränder definieren, über die hinaus keine Fenster gesetzt werden"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Name:"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Anzahl der Arbeitsflächen:"
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr ""
+"Hiermit kann man Ränder definieren, über die hinaus keine Fenster gesetzt "
+"werden"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Seitenränder"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -856,35 +887,35 @@ msgstr "_Anzahl der Arbeitsflächen:"
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Prozess in den Hintergrund abspalten"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Prozess in den Hintergrund abspalten (nicht unterstützt)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Compositor-Modus einstellen"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Compositor-Modus einstellen (nicht unterstützt)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Existierenden Fenstermanager ersetzen"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Versionsinformation anzeigen und beenden"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTE…]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Geben Sie »%s --help« für Nutzungsinformationen an."
@@ -994,7 +1025,9 @@ msgstr "%s: Farbe »%s« kann nicht zugewiesen werden\n"
 #: ../src/settings.c:275
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
-msgstr "%s: Farbe kann nicht angelegt werden: GValue für die Farbe ist nicht vom Typ STRING"
+msgstr ""
+"%s: Farbe kann nicht angelegt werden: GValue für die Farbe ist nicht vom Typ "
+"STRING"
 
 #: ../src/settings.c:282
 #, c-format
@@ -1004,7 +1037,9 @@ msgstr "%s: Farbe »%s« kann nicht eingelesen werden\n"
 #: ../src/settings.c:284
 #, c-format
 msgid "%s: Cannot parse color: GValue for color is not of type STRING"
-msgstr "%s: Farbe kann nicht eingelesen werden: GValue der Farbe ist nicht vom Typ STRING"
+msgstr ""
+"%s: Farbe kann nicht eingelesen werden: GValue der Farbe ist nicht vom Typ "
+"STRING"
 
 #: ../src/terminate.c:75
 #, c-format
@@ -1016,6 +1051,15 @@ msgstr "Daten vom Kindprozess können nicht gelesen werden: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Hilfedialog kann nicht gestartet werden: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Stellen Sie Anzahl und Namen von Arbeitsflächen ein"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Seitenränder</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Arbeitsflächen</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Namen der Arbeitsflächen ändern"
 
@@ -1217,9 +1261,6 @@ msgstr "Hilfedialog kann nicht gestartet werden: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Namen ändern"
 
-#~ msgid "Name:"
-#~ msgstr "_Name:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Klicken Sie einen Namen an, um ihn zu ändern"
 
@@ -1235,9 +1276,6 @@ msgstr "Hilfedialog kann nicht gestartet werden: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Arbeitsflächen und Seitenränder"
 
-#~ msgid "Margins"
-#~ msgstr "Seitenränder"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Fensterverwaltung"
 
diff --git a/po/dz.po b/po/dz.po
index 039b76e..25f6700 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-10-26 20:28+0530\n"
 "Last-Translator: sonam rinchen <somindruk at druknet.bt>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Poedit-Language: dzongkha\n"
 "X-Poedit-Country: bhutan\n"
@@ -82,280 +82,279 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "སྒོ་སྒྲིག་གི་བྱ་བ་ཆ་མེད་གཏང་།"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ།"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "སྒོ་སྒྲིག་གི་བྱ་བ་ཆ་མེད་གཏང་།"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་གཅུཝ་ཨིན།"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་གྲངས་:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "སྒོ་སྒྲིག་གི་བྱ་བ་ཆ་མེད་གཏང་།"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "ལཱ་གི་ས་སྒོ་ཚུ།"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "དྭངས་སྒྲིབ་ཅན་སྤོ་བཤུད་དང་ཚད་བསྐྱར་བཟོ།"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "ཨེབ་རྟ་ཤཝསྒྲིག་བཀོད།"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "ཐེངས་གཉིས་ཨེབ་གཏང་བྱ་བ།"
+msgid "<b>_Theme</b>"
+msgstr "མགོ་མིང་ཕྲང་སྒྲིག།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "ཆེད་དམིགས་ཀྱི་དཔེ།"
+msgid "<b>Title fon_t</b>"
+msgstr "མགོ་མིང་ཡིག་གཟུགས།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "སྒོ་སྒྲིག་ཆེད་དམིགས་གསརཔ་ཚུ།"
+msgid "<b>Title _alignment</b>"
+msgstr "མགོ་མིང་ཕྲང་སྒྲིག།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "ཨེབ་གཏང་གུ་ཆེར་བསྐྱེད་འབད།"
+msgid "Click and drag the buttons to change the layout"
+msgstr "སྒྲིག་བཀོད་བསྒྱུར་བཅོས་འབད་ནི་ལུ་ཨེབ་གཏང་ཞིནམ་དང་ཨེབ་རྟ་ཚུ་འདྲུད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "ཆེད་དམིགས་གུ་ཆེར་བསྐྱེད་འབད།"
+msgid "Title"
+msgstr "མགོ་མིང་།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "མགོ་མིང་ཕྲང་སྒྲིག།"
+msgid "The window title cannot be removed"
+msgstr "སྒོ་སྒྲིག་མགོ་མིང་ དེ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "མགོ་མིང་ཡིག་གཟུགས།"
+msgid "Active"
+msgstr "ཤུགས་ལྡན།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "སྒོ་སྒྲིག་མགྱོགས་ཐབས་ཚུ།"
+msgid "Menu"
+msgstr "དཀར་ཆག།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "ཝིན་ཌོསི་པར་བཏབ་དོ།"
+msgid "Stick"
+msgstr "སྦྱར་ནི།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་ལོག་མཚམས་བཟོ།"
+msgid "Shade"
+msgstr "ནག་གྲིབ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "མགོ་མིང་ཕྲང་སྒྲིག།"
+msgid "Minimize"
+msgstr "སྦོམ་བཟོ། (_x)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "སྦོམ་བཟོ་ནི།"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "ཚད་|སྦོམ།"
+msgid "Close"
+msgstr "ཁ་བསྡམས།"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "གསང་བ།"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "དྭངས་གསལ་ཅན།"
+msgid "<b>Button layout</b>"
+msgstr "ཨེབ་རྟ་ཤཝསྒྲིག་བཀོད།"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "བཟོ་རྣམ།"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "ཚད་|ཆུང་ཀུ།"
+msgid "<b>Window _shortcuts</b>"
+msgstr "སྒོ་སྒྲིག་མགྱོགས་ཐབས་ཚུ།"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "གྱང་ཚད་|རྒྱ་ཅན།"
+msgid "Ke_yboard"
+msgstr "ལྡེ་སྒྲོམ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "ཤུགས་ལྡན།"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "ཆེད་དམིགས་ཚུ་ལུ་ཨེབ་གཏང་།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "མཐོ་རིམ།"
+msgid "Focus follows _mouse"
+msgstr "ཆེད་དམིགས་གིས་མཱའུསི་རྗེས་སུ་འབྲངམ་ཨིན།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "ཝིན་ཌོསི་གིས་ཆེད་དམིགས་འཐོབ་པའི་སྐབས་རང་བཞིན་གྱིས་ཝིན་ཌོསི་ཆེད་དམིགས་འབད།"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "གསརཔ་སྦེ་གསར་བསྐྲུན་འབད་ཡོད་པའི་ཝིན་ཌོསི་ལུ་རང་བཞིན་གྱིས་ཆེད་དམིགས་བྱིན།"
+msgid "_Delay before window receives focus:"
+msgstr "ཆེད་དམིགས་འབད་ཡོད་པའི་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་མ་འབད་བའི་ཧེ་མ་ཕྱིར་འགྱངས་འབད་:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "ཆེད་དམིགས་ཚུ་ལུ་ཨེབ་གཏང་།"
+msgid "<i>Short</i>"
+msgstr "དྭངས་གསལ་ཅན།"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "སྒྲིག་བཀོད་བསྒྱུར་བཅོས་འབད་ནི་ལུ་ཨེབ་གཏང་ཞིནམ་དང་ཨེབ་རྟ་ཚུ་འདྲུད།"
+msgid "<i>Long</i>"
+msgstr "ཚད་|སྦོམ།"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "ཁ་བསྡམས།"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "ཆེད་དམིགས་ཀྱི་དཔེ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "ཆེད་དམིགས་འབད་ཡོད་པའི་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་མ་འབད་བའི་ཧེ་མ་ཕྱིར་འགྱངས་འབད་:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "གསརཔ་སྦེ་གསར་བསྐྲུན་འབད་ཡོད་པའི་ཝིན་ཌོསི་ལུ་རང་བཞིན་གྱིས་ཆེད་དམིགས་བྱིན།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "གྱང་ཚད་:"
+msgid "<b>New window focus</b>"
+msgstr "སྒོ་སྒྲིག་ཆེད་དམིགས་གསརཔ་ཚུ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "ཆེད་དམིགས་གིས་མཱའུསི་རྗེས་སུ་འབྲངམ་ཨིན།"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "ཝིན་ཌོསི་གིས་ཆེད་དམིགས་འཐོབ་པའི་སྐབས་རང་བཞིན་གྱིས་ཝིན་ཌོསི་ཆེད་དམིགས་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "གསང་བ།"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "ཆེད་དམིགས་འབད་ཡོད་པའི་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་མ་འབད་བའི་ཧེ་མ་ཕྱིར་འགྱངས་འབད་:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "སྤོ་བཤུད་འབད་བའི་སྐབས་ཝིན་ཌོསི་གི་ནང་དོན་བཀྲམ་སྟོན་འབད།"
+msgid "<b>Raise on focus</b>"
+msgstr "ཆེད་དམིགས་གུ་ཆེར་བསྐྱེད་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "ཚད་བསྐྱར་བཟོ་འབད་བའི་སྐབས་ཝིན་ཌོསི་གི་ནང་དོན་བཀྲམ་སྟོན་འབད།"
+msgid "Raise window when clicking _inside application window"
+msgstr "གློག་རིམ་སྒོ་སྒྲིག་ནང་ལུ་ཨེབ་གཏང་པའི་སྐབས་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "ལྡེ་སྒྲོམ།"
+msgid "<b>Raise on click</b>"
+msgstr "ཨེབ་གཏང་གུ་ཆེར་བསྐྱེད་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "སྦོམ་བཟོ་ནི།"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "ཆེད་དམིགས།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "དཀར་ཆག།"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "གསལ་གཞིའི་མཐའ་མཚམས་ལུ་ཝིན་ཌོསི་པར་བཏབ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "སྦོམ་བཟོ། (_x)"
+msgid "Snap windows to other _windows"
+msgstr "གཞན་ཝིན་ཌོསི་ལུ་ཝིན་ཌོསི་པར་བཏབ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "གློག་རིམ་སྒོ་སྒྲིག་ནང་ལུ་ཨེབ་གཏང་པའི་སྐབས་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་འབད།"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ནག་གྲིབ།"
+msgid "Dis_tance:"
+msgstr "གྱང་ཚད་:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "གཞན་ཝིན་ཌོསི་ལུ་ཝིན་ཌོསི་པར་བཏབ།"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "གསལ་གཞིའི་མཐའ་མཚམས་ལུ་ཝིན་ཌོསི་པར་བཏབ།"
+msgid "<i>Small</i>"
+msgstr "ཚད་|ཆུང་ཀུ།"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "སྦྱར་ནི།"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "གྱང་ཚད་|རྒྱ་ཅན།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "མགོ་མིང་ཕྲ་རིང་གུ་ཨེབ་གཏང་པའི་སྐབས་ལཱ་འགན་གྲུབ་ནི་ལུ་བྱ་བ་:"
+msgid "<b>Windows snapping</b>"
+msgstr "ཝིན་ཌོསི་པར་བཏབ་དོ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "སྒོ་སྒྲིག་མགོ་མིང་ དེ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "གསལ་གཞིའི་མཐའམ་ལུ་དཔག་བྱེད་ལྷོད་པའི་སྐབས་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "མགོ་མིང་།"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "སྒོ་སྒྲིག་ཅིག་གསལ་གཞི་གི་ཕྱི་ཁར་འདྲུད་པའི་སྐབས་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "བཀག་ནུས་ཀྱི་མཐའམ་:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་ལོག་མཚམས་བཟོ།"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "གསལ་གཞིའི་མཐའམ་ལུ་དཔག་བྱེད་ལྷོད་པའི་སྐབས་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
+msgid "Hide content of windows when _resizing"
+msgstr "ཚད་བསྐྱར་བཟོ་འབད་བའི་སྐབས་ཝིན་ཌོསི་གི་ནང་དོན་བཀྲམ་སྟོན་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "ཆེད་དམིགས་འབད་ཡོད་པའི་སྒོ་སྒྲིག་ཆེར་བསྐྱེད་མ་འབད་བའི་ཧེ་མ་ཕྱིར་འགྱངས་འབད་:"
+msgid "Hide content of windows when _moving"
+msgstr "སྤོ་བཤུད་འབད་བའི་སྐབས་ཝིན་ཌོསི་གི་ནང་དོན་བཀྲམ་སྟོན་འབད།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "བཀག་ནུས་ཀྱི་མཐའམ་:"
+msgid "<b>Box move and resize</b>"
+msgstr "དྭངས་སྒྲིབ་ཅན་སྤོ་བཤུད་དང་ཚད་བསྐྱར་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "ཆེད་དམིགས།"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "མགོ་མིང་ཕྲ་རིང་གུ་ཨེབ་གཏང་པའི་སྐབས་ལཱ་འགན་གྲུབ་ནི་ལུ་བྱ་བ་:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "ཐེངས་གཉིས་ཨེབ་གཏང་བྱ་བ།"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "བཟོ་རྣམ།"
+msgid "Ad_vanced"
+msgstr "མཐོ་རིམ།"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -732,54 +731,55 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "ཚད་|སྦོམ།"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "\"skip pager\" ཡང་ན་ \"skip taskbar\" རྒཡུ་དངོས་ཚུའི་ཆ་ཚན་ཡོད་མི་ཝིན་ཌོསི་གོམ་འགྱོ།"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "དྭངས་སྒྲིབ་ཅན།"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "གསང་བ་ (i.e. ངོས་དཔར་བཟོ་ཡོད་མི་) ཝིན་ཌོསི་གྲངས་སུ་བཙུགས།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "དྭངས་གསལ་ཅན།"
+msgid "Cycle _through windows on all workspaces"
+msgstr "ལཱ་གི་ས་སྒོ་ཚུ་ཆ་མཉམ་ལས་སྒོ་སྒྲིག་ཚུ་བརྒྱུད་དེ་བསྐྱར་འཁོར།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "ཆེད་དམིགས་ཨར་རྐུན་བཀག་ཐབས་ཤུགས་ལྡན་བཟོ།"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "བསྐྱར་འཁོར་འབད་དོ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "ཆེད་དམིགས་ཨར་རྐུན་བཀག་ཐབས་ཤུགས་ལྡན་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "རྩོམ་བྲིས་པ།"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "ཚད་ལྡན་ཨའི་སི་སི་སི་ཨེམ་ཆེད་དམིགས་བརྡ་མཚོན་བརྩི་འཇོག་འབད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "བསྐྱར་འཁོར་འབད་དོ།"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུ་ཆ་མཉམ་ལས་སྒོ་སྒྲིག་ཚུ་བརྒྱུད་དེ་བསྐྱར་འཁོར།"
+msgid "_Bring window on current workspace"
+msgstr "ཤུལ་མམ་གྱི་ལཱ་གི་ས་སྒོ་ལུ་སྒོ་སྒྲིག་བཤུད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "གསལ་གཞི་གངམ་སྤུར་ཁེབས་ཝིན་ཌོསི་ཐད་ཀར་དུ་བཀྲམ་སྟོན་འབད།"
+msgid "Switch to win_dow's workspace"
+msgstr "ལཱ་གི་ས་སྒོ་ %d ལུ་སྒོ་སྒྲིག་བཤུད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -788,182 +788,189 @@ msgstr "ག་ནི་ཡང་མེདཔ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "སྦོམ་བཟོ་བའི་སྐབས་ཝིན་ཌོསི་གི་གཞི་ཁྲམ་སྦ་བཞག།"
+msgid "Key used to _grab and move windows:"
+msgstr "ཝིན་ཌོསི་འཛིན་ནི་དང་བཤུད་ནི་ལུ་ལག་ལེན་འཐབ་མི་ ལྡེ་མིག།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "ཚད་ལྡན་ཨའི་སི་སི་སི་ཨེམ་ཆེད་དམིགས་བརྡ་མཚོན་བརྩི་འཇོག་འབད།"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "མཱའུསི་ཨེབ་རྟ་གང་རུང་ཅིག་ཨེབ་པའི་སྐབས་ཝིན་ཌོསི་ཆེར་བསྐྱེད་འབད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "སྦོམ་བཟོ་བའི་སྐབས་ཝིན་ཌོསི་གི་གཞི་ཁྲམ་སྦ་བཞག།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "ཝིན་ཌོསི་འཛིན་ནི་དང་བཤུད་ནི་ལུ་ལག་ལེན་འཐབ་མི་ ལྡེ་མིག།"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "སྤོ་བཤུད་འབད་བའི་སྐབས་སྦོམ་བཟོ་ཡོད་མི་ཝིན་ཌོསི་གི་ཚད་ངོ་མ་སོར་ཆུད་འབད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ཝིན་ཌོསི་པར་བཏབ་ནིའི་ཚབ་ལུ་བཀག་ནུས་ཀྱི་མཐའམ་ལག་ལེན་འཐབ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "སྒོ་སྒྲིག་མཛེས་བཀོད་ཚུ་གི་དྭངས་སྒྲིབ་"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "ཤུགས་མེད་ཝིན་ཌོསི་གི་དྭངས་སྒྲིབ།"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་དྭངས་སྒྲིབ།"
+msgid "_Accessibility"
+msgstr "འཛུལ་སྤྱོད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "ཝིན་ཌོསི་སྤོ་བཤུད་འབད་བའི་སྐབས་ཀྱི་དྭངས་སྒྲིབ།"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "ཝིན་ཌོསི་ཚད་བསྐྱར་བཟོ་འབད་བའི་སྐབས་ཀྱི་དྭངས་སྒྲིབ།"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "སྤོ་བཤུད་འབད་བའི་སྐབས་སྦོམ་བཟོ་ཡོད་མི་ཝིན་ཌོསི་གི་ཚད་ངོ་མ་སོར་ཆུད་འབད།"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་ཚུ་བརྒྱུད་དེ་སོར་བསྒྱུར་འབད་བའི་སྐབས་ཧེ་མའི་ལཱ་གི་ས་སྒོ་སླར་དྲན་ཡང་ན་སེམས་ཁར་བཞག།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "ཌེཀསི་ཊོཔ་སྒྲིག་བཀོད་ངོ་མ་ལུ་བརྟེན་ཏེ་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "དུས་རྒཡུན་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "དང་པམ་ཡང་ན་མཇུག་གི་ལཱ་གི་ས་སྒོ་ཚུ་ལྷོད་པའི་སྐབས་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
+msgid "_Workspaces"
+msgstr "ལཱ་གི་ས་སྒོ་ཚུ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "ལཱ་གི་ས་སྒོ་ %d ལུ་སྒོ་སྒྲིག་བཤུད།"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "སྤུར་བསྒྱིར་དྲགས་བཙུགས་བཞག་འབྱུང་སག་ས་འབད་ནི་ལུ་ཝིན་ཌོསི་གི་ཉུང་མཐའི་ཚད།"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ཝིན་ཌོསི་པར་བཏབ་ནིའི་ཚབ་ལུ་བཀག་ནུས་ཀྱི་མཐའམ་ལག་ལེན་འཐབ།"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "ཚད་|སྦོམ།"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "ཌེཀསི་ཊོཔ་སྒྲིག་བཀོད་ངོ་མ་ལུ་བརྟེན་ཏེ་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "དང་པམ་ཡང་ན་མཇུག་གི་ལཱ་གི་ས་སྒོ་ཚུ་ལྷོད་པའི་སྐབས་ལཱ་གི་ས་སྒོ་ཚུ་ལོག་མཚམས་བཟོ།"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "འཛུལ་སྤྱོད།"
+msgid "_Placement"
+msgstr "བཙུགས་བཞག།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "ཤུལ་མམ་གྱི་ལཱ་གི་ས་སྒོ་ལུ་སྒོ་སྒྲིག་བཤུད།"
+msgid "_Enable display compositing"
+msgstr "བཀྲམ་སྟོན་རྩོམ་བྲིས་འབད་ནི་ལྕོགས་ཅན་བཟོ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "གསལ་གཞི་གངམ་སྤུར་ཁེབས་ཝིན་ཌོསི་ཐད་ཀར་དུ་བཀྲམ་སྟོན་འབད།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "བཀྲམ་སྟོན་རྩོམ་བྲིས་འབད་ནི་ལྕོགས་ཅན་བཟོ།"
+msgid "Show shadows under _regular windows"
+msgstr "དུས་རྒཡུན་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "གསང་བ་ (i.e. ངོས་དཔར་བཟོ་ཡོད་མི་) ཝིན་ཌོསི་གྲངས་སུ་བཙུགས།"
+msgid "Show shadows under _dock windows"
+msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་འོག་ལུ་གྱིབ་མ་ཚུ་སྟོན།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "སྤུར་བསྒྱིར་དྲགས་བཙུགས་བཞག་འབྱུང་སག་ས་འབད་ནི་ལུ་ཝིན་ཌོསི་གི་ཉུང་མཐའི་ཚད།"
+msgid "Opaci_ty of window decorations:"
+msgstr "སྒོ་སྒྲིག་མཛེས་བཀོད་ཚུ་གི་དྭངས་སྒྲིབ་"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "བཙུགས་བཞག།"
+msgid "<i>Transparent</i>"
+msgstr "དྭངས་གསལ་ཅན།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "མཱའུསི་ཨེབ་རྟ་གང་རུང་ཅིག་ཨེབ་པའི་སྐབས་ཝིན་ཌོསི་ཆེར་བསྐྱེད་འབད།"
+msgid "<i>Opaque</i>"
+msgstr "དྭངས་སྒྲིབ་ཅན།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་ཚུ་བརྒྱུད་དེ་སོར་བསྒྱུར་འབད་བའི་སྐབས་ཧེ་མའི་ལཱ་གི་ས་སྒོ་སླར་དྲན་ཡང་ན་སེམས་ཁར་བཞག།"
+msgid "Opacity of _inactive windows:"
+msgstr "ཤུགས་མེད་ཝིན་ཌོསི་གི་དྭངས་སྒྲིབ།"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "ཝིན་ཌོསི་སྤོ་བཤུད་འབད་བའི་སྐབས་ཀྱི་དྭངས་སྒྲིབ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "\"skip pager\" ཡང་ན་ \"skip taskbar\" རྒཡུ་དངོས་ཚུའི་ཆ་ཚན་ཡོད་མི་ཝིན་ཌོསི་གོམ་འགྱོ།"
+msgid "Opacity of windows during resi_ze:"
+msgstr "ཝིན་ཌོསི་ཚད་བསྐྱར་བཟོ་འབད་བའི་སྐབས་ཀྱི་དྭངས་སྒྲིབ།"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "པོཔ་ཨཔ་ཝིན་ཌོསི་གི་དྭངས་སྒྲིབ།"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུ།"
+msgid "C_ompositor"
+msgstr "རྩོམ་བྲིས་པ།"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "ས་སྟོང་ཚུ།"
+msgid "_Number of workspaces:"
+msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་གྲངས་:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་ལོག་མཚམས་བཟོ།"
+msgid "Names"
+msgstr "མིང་:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "ས་སྟོང་ཚུ་སྒོ་སྒྲིག་མི་བཞག་ནི་ཨིན་མིའི་གསལ་གཞི་གི་མཐའམ་ཚུ་གུའི་མངའ་ཁོངས་ཚུ་ཨིན།"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་གྲངས་:"
+msgid "_Margins"
+msgstr "ས་སྟོང་ཚུ།"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -971,36 +978,36 @@ msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་གྲངས་:"
 msgid "%s (on %s)"
 msgstr "%s (གུ་ %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "ཨེཀསི་ཨེཕ་སི་ཨི་༤སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་སྒྲིག་སྟངས་ཚུ།"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1144,6 +1151,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་གྲངས་:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "ས་སྟོང་ཚུ།"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "ལཱ་གི་ས་སྒོ་ཚུའི་ལོག་མཚམས་བཟོ།"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "ལཱ་གི་ས་སྒོའི་མིང་ཚུ།"
 
@@ -1350,10 +1369,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "མིང་བསྒྱུར་བཅོས་འབད།"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "མིང་:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "ལཱགི་ས་སྒོའི་མིང་ཞུན་དག་བརྐྱབ་ནི་ལུ་ལཱ་གི་ས་སྒོའི་མིང་གུ་ཨེབ་གཏང་།"
 
@@ -1371,10 +1386,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "ལཱ་གི་ས་སྒོ་ཚུ་དང་ས་སྟོང་ཚུ།"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "ས་སྟོང་ཚུ།"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་སྒྲིག་སྟངས་ཚུ།"
 
diff --git a/po/el.po b/po/el.po
index 2dd56c8..f8f61a1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 git version\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-01-07 17:51+0200\n"
 "Last-Translator: Spiros Georgaras <sng at hellug.gr>\n"
 "Language-Team: el <nls at tux.hellug.gr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -89,238 +89,238 @@ msgid "Settings manager socket"
 msgstr "Υποδοχή διαχειριστή ρυθμίσεων"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Ρύθμιση συμπεριφοράς παραθύρων και συντομεύσεων"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Διαχειριστής παραθύρων"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ρύθμιση συμπεριφοράς παραθύρων και φαινόμενων"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Ρύθμιση συμπεριφοράς παραθύρων και συντομεύσεων"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Προσαρμογή διαχειριστή παραθύρων"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Ορισμός αριθμού και όνομα του χώρου εργασίας"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ρύθμιση συμπεριφοράς παραθύρων και φαινόμενων"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Χώροι εργασίας"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Συμπαγής μετακίνηση και αλλαγή μεγέθους</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Διάταξη κουμπιών</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Εν_έργεια διπλού κλικ</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Θέμα</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Μοντέλο εστίασης</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Γρ_αμματοσειρά τίτλου</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Εστίαση νέου παραθύρου</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Στ_οίχιση τίτλου</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Ανύψωση στο κλικ</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Επιλέξετε και σύρετε τα κουμπιά για να αλλάξετε τη διάταξη"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Ανύψωση κατά την εστίαση</b>"
+msgid "Title"
+msgstr "Τίτλος"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Στ_οίχιση τίτλου</b>"
+msgid "The window title cannot be removed"
+msgstr "Ο τίτλος του παραθύρου δεν μπορεί να αφαιρεθεί"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Γρ_αμματοσειρά τίτλου</b>"
+msgid "Active"
+msgstr "Ενεργό"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Σ_υντόμευση παραθύρου</b>"
+msgid "Menu"
+msgstr "Μενού"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Ταίριασμα παραθύρων</b>"
+msgid "Stick"
+msgstr "Επικόλληση"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Αναδίπλωση χώρων εργασίας</b>"
+msgid "Shade"
+msgstr "Σκίαση"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Θέμα</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Ελ_αχιστοποίηση"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Μεγιστοποίηση"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Γρήγορα</i>"
+msgid "Close"
+msgstr "Κλείσιμο"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Κρυμμένο"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Αργά</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Διάταξη κουμπιών</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "Στ_υλ"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Μικρό</i>"
+msgid "_Reset to Defaults"
+msgstr "_Επαναφορά στα προκαθορισμένα"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Σ_υντόμευση παραθύρου</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Ευρύ</i>"
+msgid "Ke_yboard"
+msgstr "Πλ_ηκτρολόγιο"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Ενεργό"
+msgid "Clic_k to focus"
+msgstr "Επ_ιλογή εστίασης"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Για πρ_οχωρημένους"
+msgid "Focus follows _mouse"
+msgstr "Η εστίαση ακολουθεί το π_οντίκι"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Αυτόματη αν_ύψωση παραθύρων όταν εστιαστούν"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Αυτόματη εστίαση _νέων παραθύρων όταν δημιουργούνται"
+msgid "_Delay before window receives focus:"
+msgstr "Κ_αθυστέρηση πριν την ανύψωση παραθύρου:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Επ_ιλογή εστίασης"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Επιλέξετε και σύρετε τα κουμπιά για να αλλάξετε τη διάταξη"
+msgid "<i>Short</i>"
+msgstr "<i>Αργά</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Κλείσιμο"
+msgid "<i>Long</i>"
+msgstr "<i>Γρήγορα</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Μοντέλο εστίασης</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Καθυστέρηση πρ_ιν την ανύψωση του εστιασμένου παραθύρου:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Αυτόματη εστίαση _νέων παραθύρων όταν δημιουργούνται"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Απ_όσταση:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Εστίαση νέου παραθύρου</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Η εστίαση ακολουθεί το π_οντίκι"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Αυτόματη αν_ύψωση παραθύρων όταν εστιαστούν"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Κρυμμένο"
+msgid "Delay _before raising focused window:"
+msgstr "Καθυστέρηση πρ_ιν την ανύψωση του εστιασμένου παραθύρου:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Απόκρυψη περιεχομένων των παραθύρων όταν μ_ετακινούνται"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Ανύψωση κατά την εστίαση</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Απόκρυψη των περιεχομένων των αραθύρων κατά τη α_λλαγή μεγέθους"
+msgid "Raise window when clicking _inside application window"
+msgstr "Ανύψωση παραθύρου επ_ιλέγοντας εντός του παράθυρου της εφαρμογής"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Πλ_ηκτρολόγιο"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Ανύψωση στο κλικ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Μεγιστοποίηση"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "Εστ_ίαση"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Μενού"
+msgid "Snap windows to screen _border"
+msgstr "Ταίριασμα παραθύρων στο π_ερίγραμμα της οθόνης"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Ελ_αχιστοποίηση"
+msgid "Snap windows to other _windows"
+msgstr "Ταίριασμα παραθύρων στα άλλα π_αράθυρα"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Ανύψωση παραθύρου επ_ιλέγοντας εντός του παράθυρου της εφαρμογής"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Σκίαση"
+msgid "Dis_tance:"
+msgstr "Απ_όσταση:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Ταίριασμα παραθύρων στα άλλα π_αράθυρα"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Ταίριασμα παραθύρων στο π_ερίγραμμα της οθόνης"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Μικρό</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Επικόλληση"
+msgid "<i>Wide</i>"
+msgstr "<i>Ευρύ</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Τι ενέργεια να γίνει στο διπλό κλικ στη μπάρα τίτλου"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Ταίριασμα παραθύρων</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Ο τίτλος του παραθύρου δεν μπορεί να αφαιρεθεί"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Αναδίπλωση χώρων εργασίας όταν ο δ_είκτης φτάσει στην άκρη της οθόνης"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Τίτλος"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Αναδίπλωση χώρων εργασίας όταν σ_ύρεται ένα παράθυρο έξω από την οθόνη"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Αντ_ίσταση άκρων:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Αναδίπλωση χώρων εργασίας</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Αναδίπλωση χώρων εργασίας όταν ο δ_είκτης φτάσει στην άκρη της οθόνης"
+msgid "Hide content of windows when _resizing"
+msgstr "Απόκρυψη των περιεχομένων των αραθύρων κατά τη α_λλαγή μεγέθους"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Κ_αθυστέρηση πριν την ανύψωση παραθύρου:"
+msgid "Hide content of windows when _moving"
+msgstr "Απόκρυψη περιεχομένων των παραθύρων όταν μ_ετακινούνται"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Αντ_ίσταση άκρων:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Συμπαγής μετακίνηση και αλλαγή μεγέθους</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "Εστ_ίαση"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Τι ενέργεια να γίνει στο διπλό κλικ στη μπάρα τίτλου"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Επαναφορά στα προκαθορισμένα"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Εν_έργεια διπλού κλικ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "Στ_υλ"
+msgid "Ad_vanced"
+msgstr "Για πρ_οχωρημένους"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -663,218 +663,228 @@ msgstr ""
 "Αυτό θα επαναφέρει όλες τις συντομεύσεις στις προκαθορισμένες τιμές. Είστε "
 "σίγουροι ότι θέλετε αυτό;"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Μεγάλο</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Αδιαφανές</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Πρ_οσπέραση παραθύρων όταν έχουν την ιδιότητα \"προσπέρασε ειδοποιητή\"ή "
+"\"προσπέρασε γραμμή εργασιών\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Να π_εριλαμβάνονται κρυμμένα (π.χ. ελαχιστοποιημένα) παράθυρα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Διαφανές</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Κυκλική εναλλαγή μ_εταξύ των παραθύρων σε όλους τους χώρους εργασίας"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Ενεργοποίηση προστασίας απώλειας της ε_στίασης"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Σχεδίαση του πλαισίου γύρω από τα επιλεγμένα παράθυρα όταν εναλλάσονται "
+"κυκλικά"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Στο κ_έντρο της οθόνης"
+msgid "C_ycling"
+msgstr "Κ_υκλική εναλλαγή"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Προκαθορισμένα, τοποθέτησε τα παράθυρα:"
+msgid "Activate _focus stealing prevention"
+msgstr "Ενεργοποίηση προστασίας απώλειας της ε_στίασης"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "Στ_οιχειοθέτης"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Να τηρείται η πρ_ότυπη υπόδειξη εστίασης ICCM "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Κ_υκλική εναλλαγή"
+msgid "When a window raises itself:"
+msgstr "Όταν ένα παράθυρο ανυψώνεται μόνο του:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Κυκλική εναλλαγή μ_εταξύ των παραθύρων σε όλους τους χώρους εργασίας"
+msgid "_Bring window on current workspace"
+msgstr "_Μεταφορά παραθύρου στο τρέχον χώρο εργασίας"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
-"Να απεικονίζονται απευθείας σε πλήρη ο_θόνης τα επικαλυπτόμενα παράθυρα"
+msgid "Switch to win_dow's workspace"
+msgstr "Αλλαγή στο χώρο εργασίας του παραθ_ύρου"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Μην γίνει τ_ίποτα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Απόκρυψη περιγρα_μμάτων των παραθύρων όταν μεγιστοποιούνται"
+msgid "Key used to _grab and move windows:"
+msgstr ""
+"Το πλήκτρο που θα χρησιμοποιηθεί για την αρπ_αγή και μετακίνηση παραθύρων"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Να τηρείται η πρ_ότυπη υπόδειξη εστίασης ICCM "
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Αν_ύψωση παραθύρων όταν πατηθεί οποιοδήποτε κουμπί ποντικιού"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Κράτημα επείγον παραθύρων ανα_βοσβήνοντας τα συνέχεια"
+msgid "Hide _frame of windows when maximized"
+msgstr "Απόκρυψη περιγρα_μμάτων των παραθύρων όταν μεγιστοποιούνται"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
+msgid "Restore original _size of maximized windows when moving"
 msgstr ""
-"Το πλήκτρο που θα χρησιμοποιηθεί για την αρπ_αγή και μετακίνηση παραθύρων"
+"Επαναφορά αρχικού μεγέθ_ους των μεγιστοποιημένων παραθύρων κατά τη μετακίνηση"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Αντίσταση άκρ_ων αντί για συγκόλληση παραθύρων"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
 msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 "Ειδοποίηση των επ_είγον με το να αναβοσβήνει των περίγραμμα των παραθύρων"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Δ_ιαφάνεια περιγραμμάτων παραθύρων:"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Διαφάνεια αν_ενεργών παραθύρων:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Κράτημα επείγον παραθύρων ανα_βοσβήνοντας τα συνέχεια"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Διαφάνεια αναδυόμενων π_αραθύρων:"
+msgid "_Accessibility"
+msgstr "Πρ_οσβασιμότητα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Διαφάνεια παραθύρων κατά τη μ_ετακίνηση:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Χρήση της ροδέλας του _ποντικιού στην επιφάνεια για την εναλλαγή των χώρων "
+"εργασίας"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Διαφάνεια παραθύρων κατά τη αλλαγή μεγ_έθους:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Επαναφορά αρχικού μεγέθ_ους των μεγιστοποιημένων παραθύρων κατά τη μετακίνηση"
+"Ενθύμιση και επανάκληση του π_ροηγούμενο χώρου εργασίας\n"
+"κατά την εναλλαγή μέσω συντομεύσεων πληκτρολογίου"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Εμφάνιση σκιών στα πρ_οσκολλημένα παράθυρα"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Αναδίπλωση χώρων εργασίας σύμφωνα με την πραγματική δ_ιάταξη της επιφάνειας "
+"εργασίας"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Εμφάνιση σκιών στα κ_ανονικά παράθυρα"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Αναδίπλωση χώρων εργασίας όταν _φτάσει στον πρώτο ή στον τελευταίο χώρο "
+"εργασίας "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Εμφάνιση σκιών στα αν_αδυόμενα παράθυρα"
+msgid "_Workspaces"
+msgstr "Χ_ώροι εργασίας"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Αλλαγή στο χώρο εργασίας του παραθ_ύρου"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Κάτω από τον κ_έρσορα του ποντικιού"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Αντίσταση άκρ_ων αντί για συγκόλληση παραθύρων"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
-"Χρήση της ροδέλας του _ποντικιού στην επιφάνεια για την εναλλαγή των χώρων "
-"εργασίας"
+"Το ελ_άχιστο μέγεθος παραθύρων για να ενεργοποιηθεί η έξυπνη τοποθέτηση:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Όταν ένα παράθυρο ανυψώνεται μόνο του:"
+msgid "<i>Large</i>"
+msgstr "<i>Μεγάλο</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Προκαθορισμένα, τοποθέτησε τα παράθυρα:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Αναδίπλωση χώρων εργασίας σύμφωνα με την πραγματική δ_ιάταξη της επιφάνειας "
-"εργασίας"
+msgid "At the _center of the screen"
+msgstr "Στο κ_έντρο της οθόνης"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Αναδίπλωση χώρων εργασίας όταν _φτάσει στον πρώτο ή στον τελευταίο χώρο "
-"εργασίας "
+msgid "Under the mouse _pointer"
+msgstr "Κάτω από τον κ_έρσορα του ποντικιού"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Πρ_οσβασιμότητα"
+msgid "_Placement"
+msgstr "Τ_οποθέτηση"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Μεταφορά παραθύρου στο τρέχον χώρο εργασίας"
+msgid "_Enable display compositing"
+msgstr "Εν_εργοποίηση προβολής compositing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
-"_Σχεδίαση του πλαισίου γύρω από τα επιλεγμένα παράθυρα όταν εναλλάσονται "
-"κυκλικά"
+"Να απεικονίζονται απευθείας σε πλήρη ο_θόνης τα επικαλυπτόμενα παράθυρα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Εν_εργοποίηση προβολής compositing"
+msgid "Show shadows under _regular windows"
+msgstr "Εμφάνιση σκιών στα κ_ανονικά παράθυρα"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Εμφάνιση σκιών στα αν_αδυόμενα παράθυρα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Να π_εριλαμβάνονται κρυμμένα (π.χ. ελαχιστοποιημένα) παράθυρα"
+msgid "Show shadows under _dock windows"
+msgstr "Εμφάνιση σκιών στα πρ_οσκολλημένα παράθυρα"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
-"Το ελ_άχιστο μέγεθος παραθύρων για να ενεργοποιηθεί η έξυπνη τοποθέτηση:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Δ_ιαφάνεια περιγραμμάτων παραθύρων:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "Τ_οποθέτηση"
+msgid "<i>Transparent</i>"
+msgstr "<i>Διαφανές</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Αν_ύψωση παραθύρων όταν πατηθεί οποιοδήποτε κουμπί ποντικιού"
+msgid "<i>Opaque</i>"
+msgstr "<i>Αδιαφανές</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Ενθύμιση και επανάκληση του π_ροηγούμενο χώρου εργασίας\n"
-"κατά την εναλλαγή μέσω συντομεύσεων πληκτρολογίου"
+msgid "Opacity of _inactive windows:"
+msgstr "Διαφάνεια αν_ενεργών παραθύρων:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Διαφάνεια παραθύρων κατά τη μ_ετακίνηση:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Πρ_οσπέραση παραθύρων όταν έχουν την ιδιότητα \"προσπέρασε ειδοποιητή\"ή "
-"\"προσπέρασε γραμμή εργασιών\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Διαφάνεια παραθύρων κατά τη αλλαγή μεγ_έθους:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Διαφάνεια αναδυόμενων π_αραθύρων:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Χ_ώροι εργασίας"
+msgid "C_ompositor"
+msgstr "Στ_οιχειοθέτης"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Περιθώρια</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Αρ_ιθμός χώρων εργασίας:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Xώρoι εργασίας</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Όν_ομα:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Τα περιθώρια είναι περιοχές στις άκρες της οθόνης στα οποία δεν θα "
 "τοποθετηθούν παράθυρα"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Αρ_ιθμός χώρων εργασίας:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Περιθώρια</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -882,35 +892,35 @@ msgstr "Αρ_ιθμός χώρων εργασίας:"
 msgid "%s (on %s)"
 msgstr "%s (στο %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Διακλάδωση στο παρασκήνιο"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Διακλάδωση στο παρασκήνιο (δεν υποστηρίζεται)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Ρύθμιση της λειτουργίας σύνθεσης"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Ρύθμιση της λειτουργίας σύνθεσης (δεν υποστηρίζεται)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Αντικατάσταση του τρέχοντος διαχειριστή παραθύρων"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Εμφάνιση πληροφοριών έκδοσης και έξοδος"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ΟΡΙΣΜΑΤΑ...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Πληκτρολογήστε \"% s - help \" για χρήση."
@@ -1046,12 +1056,15 @@ msgstr "Σφάλμα ανάγνωσης δεδομένων από την διε
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Δεν είναι δυνατή η έναρξη του διαλόγου: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Ορισμός αριθμού και όνομα του χώρου εργασίας"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Xώρoι εργασίας</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Αλλαγή ονομάτων χώρων εργασίας"
 
-#~ msgid "_Name:"
-#~ msgstr "Όν_ομα:"
-
 #~ msgid "Hide"
 #~ msgstr "Απόκρυψη"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 87b9864..ca23798 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-12-13 18:18+1100\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding:utf-8\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -85,238 +85,238 @@ msgid "Settings manager socket"
 msgstr "Settings manager socket"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configure window behaviour and shortcuts"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Window Manager"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Fine-tune window behaviour and effects"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configure window behaviour and shortcuts"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Window Manager Tweaks"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Set number and names of workspaces"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Fine-tune window behaviour and effects"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Workspaces"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Box move and resize</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Button layout</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Double click _action</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Theme</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Focus model</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Title fon_t</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>New window focus</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Title _alignment</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Raise on click</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Click and drag the buttons to change the layout"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Raise on focus</b>"
+msgid "Title"
+msgstr "Title"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Title _alignment</b>"
+msgid "The window title cannot be removed"
+msgstr "The window title cannot be removed"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Title fon_t</b>"
+msgid "Active"
+msgstr "Active"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Window _shortcuts</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Windows snapping</b>"
+msgid "Stick"
+msgstr "Stick"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Wrap workspaces</b>"
+msgid "Shade"
+msgstr "Shade"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Theme</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Mi_nimise"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximise"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Long</i>"
+msgid "Close"
+msgstr "Close"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Hidden"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Short</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Button layout</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Style"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Small</i>"
+msgid "_Reset to Defaults"
+msgstr "_Reset to Defaults"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Window _shortcuts</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Wide</i>"
+msgid "Ke_yboard"
+msgstr "Ke_yboard"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Active"
+msgid "Clic_k to focus"
+msgstr "Clic_k to focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Ad_vanced"
+msgid "Focus follows _mouse"
+msgstr "Focus follows _mouse"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automatically _raise windows when they receive focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automatically give focus to _newly created windows"
+msgid "_Delay before window receives focus:"
+msgstr "_Delay before window receives focus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Clic_k to focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
+msgstr "<i>Short</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Close"
+msgid "<i>Long</i>"
+msgstr "<i>Long</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Focus model</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Delay _before raising focused window:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automatically give focus to _newly created windows"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tance:"
+msgid "<b>New window focus</b>"
+msgstr "<b>New window focus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Focus follows _mouse"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automatically _raise windows when they receive focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Hidden"
+msgid "Delay _before raising focused window:"
+msgstr "Delay _before raising focused window:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Hide content of windows when _moving"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Raise on focus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Hide content of windows when _resizing"
+msgid "Raise window when clicking _inside application window"
+msgstr "Raise window when clicking _inside application window"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Ke_yboard"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Raise on click</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximise"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Snap windows to screen _border"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Mi_nimise"
+msgid "Snap windows to other _windows"
+msgstr "Snap windows to other _windows"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Raise window when clicking _inside application window"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Shade"
+msgid "Dis_tance:"
+msgstr "Dis_tance:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Snap windows to other _windows"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Snap windows to screen _border"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Small</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Stick"
+msgid "<i>Wide</i>"
+msgstr "<i>Wide</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "The action to perform when the title-bar is double-clicked"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Windows snapping</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "The window title cannot be removed"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Wrap workspaces when the _pointer reaches the screen edge"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Title"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Wrap workspaces when _dragging a window off the screen"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Edge resistance:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Wrap workspaces</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Wrap workspaces when the _pointer reaches the screen edge"
+msgid "Hide content of windows when _resizing"
+msgstr "Hide content of windows when _resizing"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Delay before window receives focus:"
+msgid "Hide content of windows when _moving"
+msgstr "Hide content of windows when _moving"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Box move and resize</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Focus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "The action to perform when the title-bar is double-clicked"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Reset to Defaults"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Double click _action</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Style"
+msgid "Ad_vanced"
+msgstr "Ad_vanced"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -659,204 +659,214 @@ msgstr ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Large</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaque</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Include hidden (i.e. iconified) windows"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparent</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Cycle _through windows on all workspaces"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Draw frame around selected windows while cycling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "At the _centre of the screen"
+msgid "C_ycling"
+msgstr "C_ycling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "By default, place windows:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activate _focus stealing prevention"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Honour _standard ICCCM focus hint"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "C_ycling"
+msgid "When a window raises itself:"
+msgstr "When a window raises itself:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
+msgstr "_Bring window on current workspace"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Display _fullscreen overlay windows directly"
+msgid "Switch to win_dow's workspace"
+msgstr "Switch to win_dow's workspace"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Do _nothing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Hide _frame of windows when maximised"
+msgid "Key used to _grab and move windows:"
+msgstr "Key used to _grab and move windows:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Honour _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Raise windows when any mouse button is pressed"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
+msgstr "Hide _frame of windows when maximised"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Key used to _grab and move windows:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Restore original _size of maximised windows when moving"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Use _edge resistance instead of window snapping"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_ty of window decorations:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notify of _urgency by making window's decoration blink"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacity of _inactive windows:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Keep urgent windows _blinking repeatedly"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacity of popup window_s:"
+msgid "_Accessibility"
+msgstr "_Accessibility"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacity of windows during _move:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Use the _mouse wheel on the desktop to switch workspaces"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacity of windows during resi_ze:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Restore original _size of maximised windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Wrap workspaces depending on the actual desktop _layout"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Show shadows under _regular windows"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Wrap workspaces when the _first or the last workspace is reached"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Show shadows under pop_up windows"
+msgid "_Workspaces"
+msgstr "_Workspaces"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Switch to win_dow's workspace"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Under the mouse _pointer"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Use _edge resistance instead of window snapping"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minimum size of windows to trigger smart placement:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "When a window raises itself:"
+msgid "<i>Large</i>"
+msgstr "<i>Large</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "By default, place windows:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
+msgstr "At the _centre of the screen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
+msgstr "Under the mouse _pointer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accessibility"
+msgid "_Placement"
+msgstr "_Placement"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Bring window on current workspace"
+msgid "_Enable display compositing"
+msgstr "_Enable display compositing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Display _fullscreen overlay windows directly"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr "Show shadows under _regular windows"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Show shadows under pop_up windows"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
+msgstr "Show shadows under _dock windows"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minimum size of windows to trigger smart placement:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_ty of window decorations:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Placement"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparent</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaque</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacity of _inactive windows:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacity of windows during _move:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacity of windows during resi_ze:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacity of popup window_s:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Workspaces"
+msgid "C_ompositor"
+msgstr "C_ompositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margins</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Number of workspaces:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Workspaces</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Name:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margins are areas on the edges of the screen where no window will be placed"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Number of workspaces:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Margins"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -864,35 +874,35 @@ msgstr "_Number of workspaces:"
 msgid "%s (on %s)"
 msgstr "%s (on %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Fork to the background"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Fork to the background (not supported)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Set the compositor mode"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Set the compositor mode (not supported)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Replace the existing window manager"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Print version information and exit"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Type \"%s --help\" for usage."
@@ -1024,6 +1034,15 @@ msgstr "Error reading data from child process: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Cannot spawn helper-dialogue: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Set number and names of workspaces"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Margins</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Workspaces</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Change workspace name"
 
@@ -1243,10 +1262,6 @@ msgstr "Cannot spawn helper-dialogue: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Change name"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Name:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Click on a workspace name to edit it"
 
@@ -1264,10 +1279,6 @@ msgstr "Cannot spawn helper-dialogue: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Workspaces and Margins"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Margins"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Window Manager Settings"
 
diff --git a/po/eo.po b/po/eo.po
index 16fe628..d30f76e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-03-11 18:40+0100\n"
 "Last-Translator: Sylvain Vedrenne <gnu_sylvain at xfce.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,284 +79,283 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Nuligu la agon de la fenestro"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Administradilo de Fenestroj"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Nuligu la agon de la fenestro"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Rafina Agordo de la Administradilo de Fenestroj"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Nombro de laborspacoj:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Nuligu la agon de la fenestro"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Laborspacoj"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Opakaj movo kaj dimensiŝanĝo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Aranĝo de la butonoj"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Efekto de duobla klako"
+msgid "<b>_Theme</b>"
+msgstr "Aranĝo de la titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Fokusa maniero"
+msgid "<b>Title fon_t</b>"
+msgstr "Tiparo de la titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Nova fenestro prenas la fokuson"
+msgid "<b>Title _alignment</b>"
+msgstr "Aranĝo de la titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Altigu je alklakigo"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Alklaku kaj trenu la butonojn por modifii la aranĝon"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Altigu je la fokusigo"
+msgid "Title"
+msgstr "Titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Aranĝo de la titolo"
+msgid "The window title cannot be removed"
+msgstr "La titolo de la fenestro ne povas esti forigita"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Tiparo de la titolo"
+msgid "Active"
+msgstr "Aktiva"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Fenestraj rapidligiloj"
+msgid "Menu"
+msgstr "Menuo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Magnetigu la fenestrojn"
+msgid "Stick"
+msgstr "Algluu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Interligitaj laborspacoj"
+msgid "Shade"
+msgstr "Volvu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Aranĝo de la titolo"
+msgid "Minimize"
+msgstr "Ma_ksimumigu"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimumigu"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Granda"
+msgid "Close"
+msgstr "Fermu"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Kaŝita"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "Travidebla"
+msgid "<b>Button layout</b>"
+msgstr "Aranĝo de la butonoj"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Stilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Eta"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Fenestraj rapidligiloj"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Granda"
+msgid "Ke_yboard"
+msgstr "Klavaro"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiva"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Alklaku por fokusi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Evoluaĵoj"
+msgid "Focus follows _mouse"
+msgstr "La fokuso sekvas la muson"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Aŭtomate altigu novan fenestron kiam ĝi ricevas la fokuson"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Aŭtomate aldonu la fokuson al novaj fenestroj"
+msgid "_Delay before window receives focus:"
+msgstr "Daŭru antaŭ altigi fokusigitan fenestron"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "Alklaku por fokusi"
+msgid "<i>Short</i>"
+msgstr "Travidebla"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Alklaku kaj trenu la butonojn por modifii la aranĝon"
+msgid "<i>Long</i>"
+msgstr "Granda"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Fermu"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Fokusa maniero"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Daŭru antaŭ altigi fokusigitan fenestron"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Aŭtomate aldonu la fokuson al novaj fenestroj"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Distanco :"
+msgid "<b>New window focus</b>"
+msgstr "Nova fenestro prenas la fokuson"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "La fokuso sekvas la muson"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Aŭtomate altigu novan fenestron kiam ĝi ricevas la fokuson"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Kaŝita"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Daŭru antaŭ altigi fokusigitan fenestron"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Montru la enhavon dum oni movas fenestron"
+msgid "<b>Raise on focus</b>"
+msgstr "Altigu je la fokusigo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Montru la enhavon dum oni ŝanĝas la dimensiojn de fenestro"
+msgid "Raise window when clicking _inside application window"
+msgstr "Altigu la fenestron kiam ĝi estas alklakigita"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Klavaro"
+msgid "<b>Raise on click</b>"
+msgstr "Altigu je alklakigo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimumigu"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Fokuso"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menuo"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Magnete algluu la fenestrojn al la ekranbordoj"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Ma_ksimumigu"
+msgid "Snap windows to other _windows"
+msgstr "Magnete algluu la fenestrojn unu al la alia"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Altigu la fenestron kiam ĝi estas alklakigita"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Volvu"
+msgid "Dis_tance:"
+msgstr "Distanco :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Magnete algluu la fenestrojn unu al la alia"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Magnete algluu la fenestrojn al la ekranbordoj"
+msgid "<i>Small</i>"
+msgstr "Eta"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Algluu"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Granda"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Ago je duobla klako sur la titolostrio :"
+msgid "<b>Windows snapping</b>"
+msgstr "Magnetigu la fenestrojn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "La titolo de la fenestro ne povas esti forigita"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Aperigu la sekvantan laborspacon kiam la muskursoro transiras la bordon de "
+"la ekrano"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titolo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Aperigu la sekvantan laborspacon kiam fenestro estas trenita trans la bordo "
 "de la ekrano"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Rezisto ĉe la bordoj :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Interligitaj laborspacoj"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Aperigu la sekvantan laborspacon kiam la muskursoro transiras la bordon de "
-"la ekrano"
+msgid "Hide content of windows when _resizing"
+msgstr "Montru la enhavon dum oni ŝanĝas la dimensiojn de fenestro"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Daŭru antaŭ altigi fokusigitan fenestron"
+msgid "Hide content of windows when _moving"
+msgstr "Montru la enhavon dum oni movas fenestron"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Rezisto ĉe la bordoj :"
+msgid "<b>Box move and resize</b>"
+msgstr "Opakaj movo kaj dimensiŝanĝo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Fokuso"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Ago je duobla klako sur la titolostrio :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Efekto de duobla klako"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-#, fuzzy
-msgid "_Style"
-msgstr "Stilo"
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Evoluaĵoj"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -734,53 +733,57 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "Granda"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Ignoru la fenestrojn kiuj havas la parametrojn \"skip pager\" aŭ \"skip "
+"taskbar\""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "Opaka"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Inkluzivu kaŝitajn (etigitajn) fenestrojn"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "Travidebla"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Cikleligu la fenestrojn de ĉiuj laborspacoj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "Malpermesu rabon de la fokuso"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "Cikleligo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "Malpermesu rabon de la fokuso"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Komponilo"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Uzu la normalan ICCCM-an fokusan indikon"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "Cikleligo"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "Cikleligu la fenestrojn de ĉiuj laborspacoj"
+msgid "_Bring window on current workspace"
+msgstr "Transloku la fenestron al la sekvanta laborspaco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Transloku la fenestron al laborspaco %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -789,185 +792,189 @@ msgstr "Nenio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "Kasxu la bordon de grandigitaj fenestroj"
+msgid "Key used to _grab and move windows:"
+msgstr "Klavo uzata por preni kaj movi fenestrojn"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Uzu la normalan ICCCM-an fokusan indikon"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Malfermu fenestron kiam alklakata per musbutono"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "Kasxu la bordon de grandigitaj fenestroj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "Klavo uzata por preni kaj movi fenestrojn"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Maksimumigita fenestro havu ĝiajn unuajn dimensiojn kiam movata"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Uzu la bordreziston anstataŭ la fenestran magnetigon"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Videbla enhavo por fenestro kies dimensioj estas ŝanĝataj"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Opakeco por neaktivaj fenestroj"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Videbla enhavo por ŝprucfenestroj"
+msgid "_Accessibility"
+msgstr "Atingebleco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Videbla enhavo por moviĝanta fenestro"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Videbla enhavo por fenestro kies dimensioj estas ŝanĝataj"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Maksimumigita fenestro havu ĝiajn unuajn dimensiojn kiam movata"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Memoru kaj reiru la antaŭan laborspacon kiam ŝanĝante per klavara rapidligilo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "Montru ombrojn sub la ŝprucfenestroj"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Cikleŝangu de laborspaco laŭ la nuna labortabla aranĝo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "Montru ombrojn sub la normalaj fenestroj"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Cikleŝangu de laborspaco kiam oni atingis la unuan aŭ la lastan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "Montru ombrojn sub la ŝprucfenestroj"
+msgid "_Workspaces"
+msgstr "Laborspacoj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Transloku la fenestron al laborspaco %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Minimumaj dimensioj de fenestro por uzi la inteligentan posiciagon"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Uzu la bordreziston anstataŭ la fenestran magnetigon"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "Granda"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Cikleŝangu de laborspaco laŭ la nuna labortabla aranĝo"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Cikleŝangu de laborspaco kiam oni atingis la unuan aŭ la lastan"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "Atingebleco"
+msgid "_Placement"
+msgstr "Posiciago"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Transloku la fenestron al la sekvanta laborspaco"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr ""
+#, fuzzy
+msgid "Show shadows under _regular windows"
+msgstr "Montru ombrojn sub la normalaj fenestroj"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "Montru ombrojn sub la ŝprucfenestroj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Inkluzivu kaŝitajn (etigitajn) fenestrojn"
+msgid "Show shadows under _dock windows"
+msgstr "Montru ombrojn sub la ŝprucfenestroj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Minimumaj dimensioj de fenestro por uzi la inteligentan posiciagon"
+msgid "Opaci_ty of window decorations:"
+msgstr "Videbla enhavo por fenestro kies dimensioj estas ŝanĝataj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "Posiciago"
+msgid "<i>Transparent</i>"
+msgstr "Travidebla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Malfermu fenestron kiam alklakata per musbutono"
+msgid "<i>Opaque</i>"
+msgstr "Opaka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Memoru kaj reiru la antaŭan laborspacon kiam ŝanĝante per klavara rapidligilo"
+msgid "Opacity of _inactive windows:"
+msgstr "Opakeco por neaktivaj fenestroj"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Videbla enhavo por moviĝanta fenestro"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Ignoru la fenestrojn kiuj havas la parametrojn \"skip pager\" aŭ \"skip "
-"taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Videbla enhavo por fenestro kies dimensioj estas ŝanĝataj"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Videbla enhavo por ŝprucfenestroj"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Laborspacoj"
+msgid "C_ompositor"
+msgstr "Komponilo"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Marĝenoj"
+msgid "_Number of workspaces:"
+msgstr "Nombro de laborspacoj:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Interligitaj laborspacoj"
+msgid "Names"
+msgstr "Nomo:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "La marĝenoj estas la regionoj ĉe la bordoj de la ekrano kie nenia fenestro "
 "estos metita"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Nombro de laborspacoj:"
+msgid "_Margins"
+msgstr "Marĝenoj"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -975,36 +982,36 @@ msgstr "Nombro de laborspacoj:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Xfce 4 Administrilo de Fenestroj"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1148,6 +1155,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Nombro de laborspacoj:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Marĝenoj"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Interligitaj laborspacoj"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Nomoj de la laborspacoj"
 
@@ -1348,10 +1367,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Modifu la nomon"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nomo:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Alklaku la nomon de laborspaco por ĝin modifii"
 
@@ -1369,10 +1384,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Laborspacoj kaj marĝenoj"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Marĝenoj"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Parametroj de la Administrilo de Fenestroj"
 
diff --git a/po/es.po b/po/es.po
index 1b4b235..c9f5cda 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the xfwm4 package.
 # Edscott Wilson Garcia <edscott at xfce.org>, 2004.
 # Abel Martín <abel.martin.ruiz at gmail.com>, 2008-2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-14 13:30+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-12-14 18:44-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish/ES <xfce-i18n at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -83,241 +83,241 @@ msgid "Settings manager socket"
 msgstr "Socket del administrador de configuración"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configure el comportamiento de ventanas y atajos"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestor de ventanas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ajuste fino de comportamiento y efectos de ventanas"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configure el comportamiento de ventanas y atajos"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ajustes del gestor de ventanas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Configure el número y los nombres de las áreas de trabajo"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ajuste fino de comportamiento y efectos de ventanas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Áreas de trabajo"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Desplazamiento y redimensionado de caja</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Distribución de botones</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Acción al hacer doble clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modelo de foco</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Tipo de letra del título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Foco para nuevas ventanas</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Alineación del título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Traer al frente al hacer clic</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Haga clic y arrastre los botones para cambiar la distribución"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Traer al frente al obtener foco</b>"
+msgid "Title"
+msgstr "Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Alineación del título</b>"
+msgid "The window title cannot be removed"
+msgstr "El título de la ventana no puede ser eliminado"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Tipo de letra del título</b>"
+msgid "Active"
+msgstr "Activa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Ata_jos para ventanas</b>"
+msgid "Menu"
+msgstr "Menú"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Atracción entre ventanas</b>"
+msgid "Stick"
+msgstr "Pegar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Recorrido cíclico de áreas de trabajo</b>"
+msgid "Shade"
+msgstr "Enrollar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Largo</i>"
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Oculta"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Corto</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Distribución de botones</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Pequeño</i>"
+msgid "_Reset to Defaults"
+msgstr "_Restablecer valores predeterminados"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Ata_jos para ventanas</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Ancho</i>"
+msgid "Ke_yboard"
+msgstr "Te_clado"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Activa"
+msgid "Clic_k to focus"
+msgstr "Cli_c para dar foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vanzado"
+msgid "Focus follows _mouse"
+msgstr "El foco sigue al _ratón"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Traer al f_rente automáticamente las ventanas cuando obtengan el foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Dar el foco automáticamente a las ventanas _nuevas"
+msgid "_Delay before window receives focus:"
+msgstr "_Tiempo de espera antes que la ventana obtenga el foco:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Cli_c para dar foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Haga clic y arrastre los botones para cambiar la distribución"
+msgid "<i>Short</i>"
+msgstr "<i>Corto</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Cerrar"
+msgid "<i>Long</i>"
+msgstr "<i>Largo</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modelo de foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Tiempo de espera _antes de traer al frente la ventana con el foco:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Dar el foco automáticamente a las ventanas _nuevas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tancia:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Foco para nuevas ventanas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "El foco sigue al _ratón"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Traer al f_rente automáticamente las ventanas cuando obtengan el foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Oculta"
+msgid "Delay _before raising focused window:"
+msgstr "Tiempo de espera _antes de traer al frente la ventana con el foco:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ocultar el contenido de ventana al _desplazar"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Traer al frente al obtener foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ocultar el contenido de las ventanas al _redimensionar"
+msgid "Raise window when clicking _inside application window"
+msgstr "Traer al frente la ventana cuando se haga clic _dentro de ella"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Te_clado"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Traer al frente al hacer clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menú"
+msgid "Snap windows to screen _border"
+msgstr "Pegar ventanas al _borde del escritorio"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimizar"
+msgid "Snap windows to other _windows"
+msgstr "Atraer _ventanas entre sí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Traer al frente la ventana cuando se haga clic _dentro de ella"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrollar"
+msgid "Dis_tance:"
+msgstr "Dis_tancia:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Atraer _ventanas entre sí"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Pegar ventanas al _borde del escritorio"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Pequeño</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Pegar"
+msgid "<i>Wide</i>"
+msgstr "<i>Ancho</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Acción a realizar cuando se haga doble clic en la barra de título"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Atracción entre ventanas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "El título de la ventana no puede ser eliminado"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Saltar a la siguiente área de trabajo cuando el _puntero llegue al borde de "
+"la pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Título"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Saltar a la siguiente área de trabajo al a_rrastrar una ventana fuera del "
 "área de trabajo actual"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Resistencia en los _bordes:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Recorrido cíclico de áreas de trabajo</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Saltar a la siguiente área de trabajo cuando el _puntero llegue al borde de "
-"la pantalla"
+msgid "Hide content of windows when _resizing"
+msgstr "Ocultar el contenido de las ventanas al _redimensionar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Tiempo de espera antes que la ventana obtenga el foco:"
+msgid "Hide content of windows when _moving"
+msgstr "Ocultar el contenido de ventana al _desplazar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Resistencia en los _bordes:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Desplazamiento y redimensionado de caja</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Foco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Acción a realizar cuando se haga doble clic en la barra de título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Restablecer valores predeterminados"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Acción al hacer doble clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stilo"
+msgid "Ad_vanced"
+msgstr "A_vanzado"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -655,209 +655,219 @@ msgstr ""
 "Esto restablecerá todos los atajos a sus valores predeterminados. ¿Está "
 "seguro de querer hacer esto?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Grande</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaco</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Omitir ventanas que tienen activas las\n"
+"propiedades \"omitir selector de tareas\" y \"omitir barra de tareas\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Incluir ventanas ocultas (i.e. miniaturizadas)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Seleccionar cíclicamente las ventanas de todas las áreas de trabajo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activar la prevención de pérdida de _foco"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Dibujar marco alrededor de las ventanas seleccionadas durante la selección"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "En el _centro de la pantalla"
+msgid "C_ycling"
+msgstr "_Selección"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Por defecto, situar ventanas:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activar la prevención de pérdida de _foco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Respetar e_stándar ICCCM de obtención de foco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Selección"
+msgid "When a window raises itself:"
+msgstr "Cuando una ventana aparece por sí misma:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Seleccionar cíclicamente las ventanas de todas las áreas de trabajo"
+msgid "_Bring window on current workspace"
+msgstr "_Traer ventana al área de trabajo actual"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Mostrar directamente superposición de ventanas a _pantalla completa"
+msgid "Switch to win_dow's workspace"
+msgstr "Cambiar al área de trabajo de la _ventana"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "No hacer _nada"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ocultar _marco de ventanas al maximizar"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla utilizada para a_garrar y desplazar ventanas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Respetar e_stándar ICCCM de obtención de foco"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Elevar ventanas al pulsar cualquier botón del ratón"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Mantener las ventanas urgentes pa_rpadeando repetidamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ocultar _marco de ventanas al maximizar"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla utilizada para a_garrar y desplazar ventanas:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Restaurar el _tamaño original de ventanas maximizadas al ser desplazadas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notificar la _urgencia haciendo parpadear la decoración de la ventana"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Usar resistencia de _borde en lugar de atracción entre ventanas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_dad de la decoración de ventanas:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notificar la _urgencia haciendo parpadear la decoración de la ventana"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacidad de ventanas _inactivas:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Mantener las ventanas urgentes pa_rpadeando repetidamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacidad de ventana_s emergentes:"
+msgid "_Accessibility"
+msgstr "_Accesibilidad"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacidad de ventanas al des_plazarse:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Usar la _rueda del ratón sobre el escritorio para cambiar de área de trabajo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacidad de ventanas durante _redimensionado:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Restaurar el _tamaño original de ventanas maximizadas al ser desplazadas"
+"_Recordar áreas de trabajo previas\n"
+"al cambiar mediante atajos de teclado"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostar sombra bajo ventanas _empotrables"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Cambiar de área de trabajo dependiendo de la _disposición real de escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostrar sombra bajo ventanas _normales"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Desplazamiento _cíclico entre áreas de trabajo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostar sombras bajo ventanas _emergentes"
+msgid "_Workspaces"
+msgstr "Áreas de _trabajo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Cambiar al área de trabajo de la _ventana"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Bajo el _puntero del ratón"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Usar resistencia de _borde en lugar de atracción entre ventanas"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Usar la _rueda del ratón sobre el escritorio para cambiar de área de trabajo"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Tamaño _mínimo de ventana para activar posicionamiento inteligente"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Cuando una ventana aparece por sí misma:"
+msgid "<i>Large</i>"
+msgstr "<i>Grande</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Por defecto, situar ventanas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Cambiar de área de trabajo dependiendo de la _disposición real de escritorio"
+msgid "At the _center of the screen"
+msgstr "En el _centro de la pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Desplazamiento _cíclico entre áreas de trabajo"
+msgid "Under the mouse _pointer"
+msgstr "Bajo el _puntero del ratón"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accesibilidad"
+msgid "_Placement"
+msgstr "_Posicionamiento"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Traer ventana al área de trabajo actual"
+msgid "_Enable display compositing"
+msgstr "_Activar composición de visualización"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
-"_Dibujar marco alrededor de las ventanas seleccionadas durante la selección"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Mostrar directamente superposición de ventanas a _pantalla completa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Activar composición de visualización"
+msgid "Show shadows under _regular windows"
+msgstr "Mostrar sombra bajo ventanas _normales"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostar sombras bajo ventanas _emergentes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Incluir ventanas ocultas (i.e. miniaturizadas)"
+msgid "Show shadows under _dock windows"
+msgstr "Mostar sombra bajo ventanas _empotrables"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Tamaño _mínimo de ventana para activar posicionamiento inteligente"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_dad de la decoración de ventanas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Posicionamiento"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Elevar ventanas al pulsar cualquier botón del ratón"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaco</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Recordar áreas de trabajo previas\n"
-"al cambiar mediante atajos de teclado"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacidad de ventanas _inactivas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacidad de ventanas al des_plazarse:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Omitir ventanas que tienen activas las\n"
-"propiedades \"omitir selector de tareas\" y \"omitir barra de tareas\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacidad de ventanas durante _redimensionado:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacidad de ventana_s emergentes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Áreas de _trabajo"
+msgid "C_ompositor"
+msgstr "C_ompositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Márgenes</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Número de áreas de trabajo:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Áreas de trabajo</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nombre:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Los márgenes son áreas a los lados de la pantalla donde no se colocará "
 "ninguna ventana"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Número de áreas de trabajo:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Márgenes"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -865,35 +875,35 @@ msgstr "_Número de áreas de trabajo:"
 msgid "%s (on %s)"
 msgstr "%s (en %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Pasar a segundo plano"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Modo de segundo plano no soportado"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Activa la composición"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Composición no soportada"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Mantener acción del gestor de ventanas"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Información de versión"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTOS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Pruebe \"%s --help\" para más información"
@@ -1027,6 +1037,15 @@ msgstr "Error al leer datos del proceso hijo: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "No se puede desplegar el diálogo de ayuda: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Configure el número y los nombres de las áreas de trabajo"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Márgenes</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Áreas de trabajo</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Cambiar nombre del área de trabajo"
 
@@ -1220,9 +1239,6 @@ msgstr "No se puede desplegar el diálogo de ayuda: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Cambiar nombre"
 
-#~ msgid "Name:"
-#~ msgstr "Nombre:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Pinche en el nombre de escritorio para editarlo"
 
@@ -1238,9 +1254,6 @@ msgstr "No se puede desplegar el diálogo de ayuda: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Escritorios y márgenes"
 
-#~ msgid "Margins"
-#~ msgstr "Márgenes"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Configuración del gestor de ventanas"
 
diff --git a/po/es_MX.po b/po/es_MX.po
index b93c2cf..febd89b 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-08-19 21:14+0900\n"
 "Last-Translator: Edscott Wilson Garcia <edscott at xfce.org>\n"
 "Language-Team: Spanish <es at li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -78,283 +78,282 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestor de Ventanas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "Gestor de Ventanas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Número de escritorios:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Escritorios"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Redimensionado y movimiento opaco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Disposición de los botones"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Acción al hacer doble click"
+msgid "<b>_Theme</b>"
+msgstr "Alineado del Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Modelo de foco"
+msgid "<b>Title fon_t</b>"
+msgstr "Fuente del Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Nuevo foco de ventana"
+msgid "<b>Title _alignment</b>"
+msgstr "Alineado del Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Levantar al pinchar"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Pinche y arrastre botones para cambiar el esquema"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Levantar con el foco"
+msgid "Title"
+msgstr "Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Alineado del Título"
+msgid "The window title cannot be removed"
+msgstr "El título de ventana, no puede ser removido"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Fuente del Título"
+msgid "Active"
+msgstr "Activo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Atajos para las ventanas"
+msgid "Menu"
+msgstr "Menú"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Atracción de las ventanas"
+msgid "Stick"
+msgstr "Pegar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Saltar al escritorio siguiente"
+msgid "Shade"
+msgstr "Enrollar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Alineado del Título"
+msgid "Minimize"
+msgstr "Ma_ximizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Oculto"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "Disposición de los botones"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Estilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Pequeño"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Atajos para las ventanas"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Distancia :"
+msgid "Ke_yboard"
+msgstr "Teclado"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Activo"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Pinchar para dar foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Avanzado"
+msgid "Focus follows _mouse"
+msgstr "El foco sigue al ratón"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automáticamente levantar ventanas cuando tengan el foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automáticamente dar el foco a las ventanas nuevas"
+msgid "_Delay before window receives focus:"
+msgstr "Espera antes de levantar la ventana con foco :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "Pinchar para dar foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Pinche y arrastre botones para cambiar el esquema"
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Cerrar"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Modelo de foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Espera antes de levantar la ventana con foco :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automáticamente dar el foco a las ventanas nuevas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Distancia :"
+msgid "<b>New window focus</b>"
+msgstr "Nuevo foco de ventana"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "El foco sigue al ratón"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automáticamente levantar ventanas cuando tengan el foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Oculto"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Espera antes de levantar la ventana con foco :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Mostrar contenido de la ventana cuando se mueva"
+msgid "<b>Raise on focus</b>"
+msgstr "Levantar con el foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
+msgid "Raise window when clicking _inside application window"
+msgstr "Levantar la ventana cuando se pinche dentro de ella"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Teclado"
+msgid "<b>Raise on click</b>"
+msgstr "Levantar al pinchar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menú"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Pegar ventanas al borde del escritorio"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Ma_ximizar"
+msgid "Snap windows to other _windows"
+msgstr "Atraer ventanas entre si"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Levantar la ventana cuando se pinche dentro de ella"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrollar"
+msgid "Dis_tance:"
+msgstr "Distancia :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Atraer ventanas entre si"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Pegar ventanas al borde del escritorio"
+msgid "<i>Small</i>"
+msgstr "Pequeño"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Pegar"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Distancia :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Acción a realizar cuando se haga doble click en la barra de título :"
+msgid "<b>Windows snapping</b>"
+msgstr "Atracción de las ventanas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "El título de ventana, no puede ser removido"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Saltar al siguiente escritorio cuando el puntero llegue al borde del "
+"escritorio"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Título"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Saltar al siguiente escritorio al arrastrar las ventanas fuera del "
 "escritorio actual"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Resistencia en los bordes :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Saltar al escritorio siguiente"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Saltar al siguiente escritorio cuando el puntero llegue al borde del "
-"escritorio"
+msgid "Hide content of windows when _resizing"
+msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Espera antes de levantar la ventana con foco :"
+msgid "Hide content of windows when _moving"
+msgstr "Mostrar contenido de la ventana cuando se mueva"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Resistencia en los bordes :"
+msgid "<b>Box move and resize</b>"
+msgstr "Redimensionado y movimiento opaco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Foco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Acción a realizar cuando se haga doble click en la barra de título :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Acción al hacer doble click"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Estilo"
+msgid "Ad_vanced"
+msgstr "Avanzado"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -741,48 +740,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "Mover ventana al próximo escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "Generar atajo"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "Mover ventana al próximo escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Mover ventana al escritorio 1"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -790,170 +791,176 @@ msgid "Do _nothing"
 msgstr "Nada"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Mostrar contenido de la ventana cuando se mueva"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Mostrar contenido de la ventana cuando se mueva"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Mostrar contenido de la ventana cuando se mueva"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Mostrar contenido de la ventana cuando se mueva"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Mostrar contenido de la ventana cuando se mueva"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
 msgstr ""
+"Saltar al siguiente escritorio cuando el puntero llegue al borde del "
+"escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Mover ventana al escritorio 1"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "Escritorios"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
-"Saltar al siguiente escritorio cuando el puntero llegue al borde del "
-"escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Mover ventana al próximo escritorio"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "Mostrar contenido de la ventana cuando se mueva"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Mostrar contenido de la ventana cuando se mueva"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "Mostrar el contenido de las ventanas cuando se redimensionen"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Mostrar contenido de la ventana cuando se mueva"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Escritorios"
+msgid "C_ompositor"
+msgstr "Generar atajo"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Márgenes"
+msgid "_Number of workspaces:"
+msgstr "Número de escritorios:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Saltar al escritorio siguiente"
+msgid "Names"
+msgstr "Nombre :"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Los bordes son áreas a los lados de la pantalla donde no se colocará ninguna "
 "ventana"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Número de escritorios:"
+msgid "_Margins"
+msgstr "Márgenes"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -961,36 +968,36 @@ msgstr "Número de escritorios:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Gestor de Ventanas"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1134,6 +1141,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Número de escritorios:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Márgenes"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Saltar al escritorio siguiente"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Nombres de escritorio"
 
@@ -1247,10 +1266,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Cambiar nombre"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nombre :"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Pinche en el nombre de escritorio para editarlo"
 
@@ -1270,10 +1285,6 @@ msgstr ""
 #~ msgstr "Escritorios y Márgenes"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Márgenes"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "Gestor de Ventanas"
 
diff --git a/po/et.po b/po/et.po
index 73fbd4b..2eb6137 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-04-18 10:02+0300\n"
 "Last-Translator: Mart Tõnso <mart.tonso at ttu.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -79,280 +79,279 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Akna kaunistuste läbipaistmatus"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Aknahaldur"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Akna kaunistuste läbipaistmatus"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Aknahalduri ülehäälestamine"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Tööruumide arv:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Akna kaunistuste läbipaistmatus"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Tööruumid"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Akna liigutamine ja suuruse muutmine"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Nuppude asetus"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Topeltklõpsu tegevus"
+msgid "<b>_Theme</b>"
+msgstr "Pealkirja paigutus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Fookuse mudel"
+msgid "<b>Title fon_t</b>"
+msgstr "Pealkirja font"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Uue akna fookus"
+msgid "<b>Title _alignment</b>"
+msgstr "Pealkirja paigutus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Tõsta klõpsu korral"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Paigutuse muutmiseks klõpsi ja tiri nuppe"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Tõsta aken fookuse saamisel"
+msgid "Title"
+msgstr "Pealkiri"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Pealkirja paigutus"
+msgid "The window title cannot be removed"
+msgstr "Akna pealkirja ei saa eemaldada."
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Pealkirja font"
+msgid "Active"
+msgstr "Aktiivne"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Akende kiirklahvid"
+msgid "Menu"
+msgstr "Menüü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Akna haakumine"
+msgid "Stick"
+msgstr "Nael"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Töölaua vahetus"
+msgid "Shade"
+msgstr "Varja"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Pealkirja paigutus"
+msgid "Minimize"
+msgstr "_Suurenda"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Suurenda"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Suurus|Suur"
+msgid "Close"
+msgstr "Sulge"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Varjatud"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "Läbipaistev"
+msgid "<b>Button layout</b>"
+msgstr "Nuppude asetus"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Stiil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Suurus|Väike"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Akende kiirklahvid"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Kaugus|Lai"
+msgid "Ke_yboard"
+msgstr "Klaviatuur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiivne"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Klõpsa fokuseerimiseks"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Edasijõudnud"
+msgid "Focus follows _mouse"
+msgstr "Fookus järgib hiirt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Tõsta aknaid automaatselt, kui nad saavad fookuse"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Anna fookus automaatselt uutele akendele"
+msgid "_Delay before window receives focus:"
+msgstr "Viivitus enne fokuseeritud akna tõstmist :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "Klõpsa fokuseerimiseks"
+msgid "<i>Short</i>"
+msgstr "Läbipaistev"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Paigutuse muutmiseks klõpsi ja tiri nuppe"
+msgid "<i>Long</i>"
+msgstr "Suurus|Suur"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Sulge"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Fookuse mudel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Viivitus enne fokuseeritud akna tõstmist :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Anna fookus automaatselt uutele akendele"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Kaugus :"
+msgid "<b>New window focus</b>"
+msgstr "Uue akna fookus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Fookus järgib hiirt"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Tõsta aknaid automaatselt, kui nad saavad fookuse"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Varjatud"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Viivitus enne fokuseeritud akna tõstmist :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Näita akna sisu selle liigutamise ajal"
+msgid "<b>Raise on focus</b>"
+msgstr "Tõsta aken fookuse saamisel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Näita akna sisu selle suuruse muutmise ajal"
+msgid "Raise window when clicking _inside application window"
+msgstr "Tõsta aken, kui akna sees klõpsatakse"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Klaviatuur"
+msgid "<b>Raise on click</b>"
+msgstr "Tõsta klõpsu korral"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Suurenda"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Fookus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menüü"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Haagi aknaid ekraani äärtel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "_Suurenda"
+msgid "Snap windows to other _windows"
+msgstr "Haagi aknaid teiste akende külge"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Tõsta aken, kui akna sees klõpsatakse"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Varja"
+msgid "Dis_tance:"
+msgstr "Kaugus :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Haagi aknaid teiste akende külge"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Haagi aknaid ekraani äärtel"
+msgid "<i>Small</i>"
+msgstr "Suurus|Väike"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Nael"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Kaugus|Lai"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Mida teha kui topeltklõpsatakse pealkirja ribal"
+msgid "<b>Windows snapping</b>"
+msgstr "Akna haakumine"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "Akna pealkirja ei saa eemaldada."
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Vaheta töölauda, kui kursor jõuab akna äärde"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Pealkiri"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Vaheta töölauda, kui akent kantakse üle ekraani ääre"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Ääre vastupanu :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Töölaua vahetus"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Vaheta töölauda, kui kursor jõuab akna äärde"
+msgid "Hide content of windows when _resizing"
+msgstr "Näita akna sisu selle suuruse muutmise ajal"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Viivitus enne fokuseeritud akna tõstmist :"
+msgid "Hide content of windows when _moving"
+msgstr "Näita akna sisu selle liigutamise ajal"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Ääre vastupanu :"
+msgid "<b>Box move and resize</b>"
+msgstr "Akna liigutamine ja suuruse muutmine"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Fookus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Mida teha kui topeltklõpsatakse pealkirja ribal"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Topeltklõpsu tegevus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-#, fuzzy
-msgid "_Style"
-msgstr "Stiil"
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Edasijõudnud"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -731,53 +730,57 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "Suurus|Suur"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Lisa aknad, millel on \"eira lehitsejat\" või \"eira tegumiriba\" omadused "
+"seatud"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "Läbipaistmatu"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Lisa varjatud (ehk ikoniseeritud) aknad"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "Läbipaistev"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Tsükleeri üle kõigi töölaudade akende"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "Aktiveeri fookuse näppamise ennetustegevus"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "Tsükleerimine"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "Aktiveeri fookuse näppamise ennetustegevus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Kujundaja"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Austa standartset ICCCM fookuse vihjet"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "Tsükleerimine"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "Tsükleeri üle kõigi töölaudade akende"
+msgid "_Bring window on current workspace"
+msgstr "Saada aken järgmisesse tööruumi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Saada aken tööruumi %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -785,184 +788,188 @@ msgid "Do _nothing"
 msgstr "Ei midagi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr ""
+#, fuzzy
+msgid "Key used to _grab and move windows:"
+msgstr "Klahv, mida kasutada akna haaramiseks ja liigutamiseks"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Austa standartset ICCCM fookuse vihjet"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Tõsta aken kui ükskõik millist hiire nuppu toksitakse"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "Klahv, mida kasutada akna haaramiseks ja liigutamiseks"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Taasta suurendatud akende originaalne suurus nende liigutamisel"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Kasuta ääre vastuhakku akende haakimise asemel"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Akna kaunistuste läbipaistmatus"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Hüpikakende läbipaistmatus"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Hüpikakende läbipaistmatus"
+msgid "_Accessibility"
+msgstr "Käsitletavus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Akna läbipaistmatus liigutamise ajal"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Akna läbipaistmatus suuruse muutmise ajal"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Taasta suurendatud akende originaalne suurus nende liigutamisel"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Pea meeles ja kutsu esile eelmine töölaud kui lülitamine käib klaviatuuri "
+"kiirklahvide abil."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "Näita varju hüpikakende taga"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Muuda töölaudu sõltuvalt tegelikust töölaua laotusest"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "Näita varje tavaliste akende taga"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Vaheta töölaud teise äärde, kui esimene või viimane töölaud on ees"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "Näita varju hüpikakende taga"
+msgid "_Workspaces"
+msgstr "Tööruumid"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Saada aken tööruumi %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Akende vähim suurus, mis käivitab targa paigutuse"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Kasuta ääre vastuhakku akende haakimise asemel"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "Suurus|Suur"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Muuda töölaudu sõltuvalt tegelikust töölaua laotusest"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Vaheta töölaud teise äärde, kui esimene või viimane töölaud on ees"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "Käsitletavus"
+msgid "_Placement"
+msgstr "Asetus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Saada aken järgmisesse tööruumi"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr ""
+#, fuzzy
+msgid "Show shadows under _regular windows"
+msgstr "Näita varje tavaliste akende taga"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "Näita varju hüpikakende taga"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Lisa varjatud (ehk ikoniseeritud) aknad"
+msgid "Show shadows under _dock windows"
+msgstr "Näita varju hüpikakende taga"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Akende vähim suurus, mis käivitab targa paigutuse"
+msgid "Opaci_ty of window decorations:"
+msgstr "Akna kaunistuste läbipaistmatus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "Asetus"
+msgid "<i>Transparent</i>"
+msgstr "Läbipaistev"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Tõsta aken kui ükskõik millist hiire nuppu toksitakse"
+msgid "<i>Opaque</i>"
+msgstr "Läbipaistmatu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Pea meeles ja kutsu esile eelmine töölaud kui lülitamine käib klaviatuuri "
-"kiirklahvide abil."
+msgid "Opacity of _inactive windows:"
+msgstr "Hüpikakende läbipaistmatus"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Akna läbipaistmatus liigutamise ajal"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Lisa aknad, millel on \"eira lehitsejat\" või \"eira tegumiriba\" omadused "
-"seatud"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Akna läbipaistmatus suuruse muutmise ajal"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Hüpikakende läbipaistmatus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Tööruumid"
+msgid "C_ompositor"
+msgstr "Kujundaja"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Ääred"
+msgid "_Number of workspaces:"
+msgstr "Tööruumide arv:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Töölaua vahetus"
+msgid "Names"
+msgstr "Nimi:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Ääred on alad ekraani äärtes, kuhu aknaid ei paigutata"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Tööruumide arv:"
+msgid "_Margins"
+msgstr "Ääred"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -970,36 +977,36 @@ msgstr "Tööruumide arv:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Aknahalduri ülehäälestamine"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1143,6 +1150,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Tööruumide arv:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Ääred"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Töölaua vahetus"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Tööruumide nimed"
 
@@ -1343,10 +1362,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Muuda nime"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Tööruumi nime muutmiseks klõpsa sellel"
 
@@ -1366,10 +1381,6 @@ msgstr ""
 #~ msgstr "Tööruumid ja ääred"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Ääred"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "Aknahalduri ülehäälestamine"
 
diff --git a/po/eu.po b/po/eu.po
index a73c140..2d2d5ff 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-12-15 11:54+0100\n"
 "Last-Translator: Piarres Beobide <pi+debian at beobide.net>\n"
 "Language-Team: Basque <debian-l10n-basque at lists.debian.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -86,237 +86,237 @@ msgid "Settings manager socket"
 msgstr "Ezarpena kudeatzaile socketa"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Leiho portaera eta lastre-teklak konfiguratu"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Leiho kudeatzailea"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Leiho portaera eta efektuak doitu"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Leiho portaera eta lastre-teklak konfiguratu"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Leiho kudeatzaile ezarpenak"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Ezarri idazmahai kopurua eta izenak"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Leiho portaera eta efektuak doitu"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Idazmahaiak"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Kutxa tamaina aldatzea eta mugitzea</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Botoi-diseinua</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Klik bikoitzaren ekintza</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Gaia</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Foku modeloa</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Izenburuaren karak_tere-jokoa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Leiho berri fokoa</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Izenburu _lerrokatzea</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Bistaratu klikatzerakoan</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klikatu eta arratratu botoiak ingurunea eraldatzeko"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Goratu fokuaz</b>"
+msgid "Title"
+msgstr "Izenburua"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Izenburu _lerrokatzea</b>"
+msgid "The window title cannot be removed"
+msgstr "Leiho izenburua ezin da ezabatu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Izenburuaren karak_tere-jokoa</b>"
+msgid "Active"
+msgstr "Gaiturik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Leiho laster-teklak</b>"
+msgid "Menu"
+msgstr "Menua"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Leiho itsasgarritasuna</b>"
+msgid "Stick"
+msgstr "Finkatu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Itzulbiratu idazmahaiak</b>"
+msgid "Shade"
+msgstr "Bildu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Gaia</b>"
+msgid "Minimize"
+msgstr "Txikitu"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Handitu"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Luzea</i>"
+msgid "Close"
+msgstr "Itxi"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ezkutukoa"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Laburra</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Botoi-diseinua</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stiloa"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Txikia</i>"
+msgid "_Reset to Defaults"
+msgstr "Be_rrezarri lehenespenetara"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Leiho laster-teklak</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Zabala</i>"
+msgid "Ke_yboard"
+msgstr "Tek_latua"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Gaiturik"
+msgid "Clic_k to focus"
+msgstr "Egin _klik fokua ezartzeko"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Au_rreratua"
+msgid "Focus follows _mouse"
+msgstr "Fokuak _sagua jarraitzen du"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automatikoki _goratu leihoak fokua dutenean"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automatikoki ezarri fokua leiho _berrietan"
+msgid "_Delay before window receives focus:"
+msgstr "Fokua duen leihoa bistaratu arteko _denbora:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Egin _klik fokua ezartzeko"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klikatu eta arratratu botoiak ingurunea eraldatzeko"
+msgid "<i>Short</i>"
+msgstr "<i>Laburra</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Itxi"
+msgid "<i>Long</i>"
+msgstr "<i>Luzea</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Foku modeloa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Fokua duen leihoa bistaratu arte _itxarongo den denbora :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automatikoki ezarri fokua leiho _berrietan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Tartea :"
+msgid "<b>New window focus</b>"
+msgstr "<b>Leiho berri fokoa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokuak _sagua jarraitzen du"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automatikoki _goratu leihoak fokua dutenean"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ezkutukoa"
+msgid "Delay _before raising focused window:"
+msgstr "Fokua duen leihoa bistaratu arte _itxarongo den denbora :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ezkutatu leihoaren edukia _mugitzerakoan"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Goratu fokuaz</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ezkutatu leihoaren edukia _tamainaz aldatzean"
+msgid "Raise window when clicking _inside application window"
+msgstr "Goratu leihoa, honen _barnean klikatzerakoan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Tek_latua"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Bistaratu klikatzerakoan</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Handitu"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokua"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menua"
+msgid "Snap windows to screen _border"
+msgstr "Itsatsi leihoak pantaila _ertzari"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Txikitu"
+msgid "Snap windows to other _windows"
+msgstr "Itsatsi _leihoak beraien artean"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Goratu leihoa, honen _barnean klikatzerakoan"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Bildu"
+msgid "Dis_tance:"
+msgstr "_Tartea :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Itsatsi _leihoak beraien artean"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Itsatsi leihoak pantaila _ertzari"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Txikia</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Finkatu"
+msgid "<i>Wide</i>"
+msgstr "<i>Zabala</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Titulu-barran bi aldiz klikatzerakoan egingo den ekintza"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Leiho itsasgarritasuna</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Leiho izenburua ezin da ezabatu"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Joan hurrengo idazmahaiera sagua _pantaila ertzera ailatzerakoan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Izenburua"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Leihoak _arrastatzerakoan hurrengo mahaigainera pasa"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Ertzaren erresistentzia :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Itzulbiratu idazmahaiak</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Joan hurrengo idazmahaiera sagua _pantaila ertzera ailatzerakoan"
+msgid "Hide content of windows when _resizing"
+msgstr "Ezkutatu leihoaren edukia _tamainaz aldatzean"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Fokua duen leihoa bistaratu arteko _denbora:"
+msgid "Hide content of windows when _moving"
+msgstr "Ezkutatu leihoaren edukia _mugitzerakoan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Ertzaren erresistentzia :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Kutxa tamaina aldatzea eta mugitzea</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokua"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Titulu-barran bi aldiz klikatzerakoan egingo den ekintza"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Be_rrezarri lehenespenetara"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Klik bikoitzaren ekintza</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stiloa"
+msgid "Ad_vanced"
+msgstr "Au_rreratua"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -658,204 +658,214 @@ msgstr ""
 "Honek laster-tekla guztiak lehenetsitako balioetara ezarriko ditu. Ziur hau "
 "egin nahi duzula?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Handia</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opakoa</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"orrialdekatzailea utzi\" edo \"ataza-barra utzi\"\n"
+"propietateak ezarririk duten leihoa e_zik"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Ezkutatutako leihoak (adib, txikitutakoak) barne"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Gardena</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Idazmahai _guztien artean ziklikoki aldatu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "_Foku lapurtze aurreikuspena gaitu"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Marraztu markoa hautatutako leihoaren inguruan txandakatzean"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Panatailaren er_dian"
+msgid "C_ycling"
+msgstr "Z_iklikoki"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Lehenespen gisa, leiho kokalekua:"
+msgid "Activate _focus stealing prevention"
+msgstr "_Foku lapurtze aurreikuspena gaitu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "S_ortzailea"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "ICCCM e_standarreko foko gomendioei ohore egin"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Z_iklikoki"
+msgid "When a window raises itself:"
+msgstr "Leiho batek bere burua nabarmentzean:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Idazmahai _guztien artean ziklikoki aldatu"
+msgid "_Bring window on current workspace"
+msgstr "_Ekarri leihoa uneko idazmahaiera"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Zuzenean leihoak _pantaila osoan bistarazi"
+msgid "Switch to win_dow's workspace"
+msgstr "Aldatu lei_hoaren idazmahaiera"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Eze_r ez egin"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Leiho _markoa ezkutatu guztiz handitzean"
+msgid "Key used to _grab and move windows:"
+msgstr "Leihoak _eldu eta mugitzeko erabiliko den tekla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "ICCCM e_standarreko foko gomendioei ohore egin"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Leihoa _erakarri saguaren edozein botoi sakatzean"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Mantendu premiazko leihoak _keinuka"
+msgid "Hide _frame of windows when maximized"
+msgstr "Leiho _markoa ezkutatu guztiz handitzean"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Leihoak _eldu eta mugitzeko erabiliko den tekla"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Mugitzerakoan maximizatutako leihoen jatorrizko _tamaina berezarri"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Larrialdi be_rriematea leiho dekoraziak keinu egitearen bidez"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "_Ertz erresistentzia erabili leiho elkartzea beharrean"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Leiho dekorazioaren opako_tasuna"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Larrialdi be_rriematea leiho dekoraziak keinu egitearen bidez"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Leiho _inaktiboen opakotasuna"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Mantendu premiazko leihoak _keinuka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Popup leihoen opakota_suna"
+msgid "_Accessibility"
+msgstr "_Erabilgarritasuna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "_Mugitzerakoan leihoaren opakotasuna"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "_Sagu gurpilak mahaigainaren gainean idazmahaiak txandakatzen ditu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Tamaina_z aldatzean leihoaren opakotasuna"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Mugitzerakoan maximizatutako leihoen jatorrizko _tamaina berezarri"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Aurreko idazmahaia _gogoratu eta berriz deitu\n"
+"teklatu laster-tekla bitartez aldatzean"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Itzalak bistarazi _blokeaturiko leihoen azpian"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Idazmahaiak egokitu erabiltzen den _uneko idazmahai ingurunearen arabera"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Itzalak bistarazi leiho _arrunten azpian"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Idazmahaiak egokitu _lehen edo azken idazmahaiera ailatzerakoan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Itzalak bistarazi popup leihoen azpian"
+msgid "_Workspaces"
+msgstr "_Idazmahaiak"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Aldatu lei_hoaren idazmahaiera"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sagu markatzailearen az_pian"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "_Ertz erresistentzia erabili leiho elkartzea beharrean"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "_Sagu gurpilak mahaigainaren gainean idazmahaiak txandakatzen ditu"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Leihoen _gutxieneko tamaina abiarazte garbi kokapenean"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Leiho batek bere burua nabarmentzean:"
+msgid "<i>Large</i>"
+msgstr "<i>Handia</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Lehenespen gisa, leiho kokalekua:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Idazmahaiak egokitu erabiltzen den _uneko idazmahai ingurunearen arabera"
+msgid "At the _center of the screen"
+msgstr "Panatailaren er_dian"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Idazmahaiak egokitu _lehen edo azken idazmahaiera ailatzerakoan"
+msgid "Under the mouse _pointer"
+msgstr "Sagu markatzailearen az_pian"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Erabilgarritasuna"
+msgid "_Placement"
+msgstr "_Kokalekua"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Ekarri leihoa uneko idazmahaiera"
+msgid "_Enable display compositing"
+msgstr "_Pantaila konposizioa gaitu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Marraztu markoa hautatutako leihoaren inguruan txandakatzean"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Zuzenean leihoak _pantaila osoan bistarazi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Pantaila konposizioa gaitu"
+msgid "Show shadows under _regular windows"
+msgstr "Itzalak bistarazi leiho _arrunten azpian"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Itzalak bistarazi popup leihoen azpian"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Ezkutatutako leihoak (adib, txikitutakoak) barne"
+msgid "Show shadows under _dock windows"
+msgstr "Itzalak bistarazi _blokeaturiko leihoen azpian"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Leihoen _gutxieneko tamaina abiarazte garbi kokapenean"
+msgid "Opaci_ty of window decorations:"
+msgstr "Leiho dekorazioaren opako_tasuna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Kokalekua"
+msgid "<i>Transparent</i>"
+msgstr "<i>Gardena</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Leihoa _erakarri saguaren edozein botoi sakatzean"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opakoa</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Aurreko idazmahaia _gogoratu eta berriz deitu\n"
-"teklatu laster-tekla bitartez aldatzean"
+msgid "Opacity of _inactive windows:"
+msgstr "Leiho _inaktiboen opakotasuna"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "_Mugitzerakoan leihoaren opakotasuna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"orrialdekatzailea utzi\" edo \"ataza-barra utzi\"\n"
-"propietateak ezarririk duten leihoa e_zik"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Tamaina_z aldatzean leihoaren opakotasuna"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Popup leihoen opakota_suna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Idazmahaiak"
+msgid "C_ompositor"
+msgstr "S_ortzailea"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marjinak</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "idazmahai _kopurua:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Idazmahaiak</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Izena:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Marjinak pantailaren ertzetan leihorik kokatu ezin den eremuak dira"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "idazmahai _kopurua:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Marjinak"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -863,35 +873,35 @@ msgstr "idazmahai _kopurua:"
 msgid "%s (on %s)"
 msgstr "%s (%s-(e)n)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Banandu atzealdera"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Banandu atzealdera (euskarririk gabe)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Ezarri konposizio modua"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Ezarri konposizio modua (euskarririk gabe)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Ordeztu dagoen leiho kudeatzailea"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Bertsio argibideak inprimatu eta irten"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTUAK...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Idatzi \"%s --help\" erabilerarako."
@@ -1025,6 +1035,15 @@ msgstr "Errorea seme-prozesutik datuak irakurtzean: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Ezin da laguntza-elkarrizketa abiarazi: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Ezarri idazmahai kopurua eta izenak"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Marjinak</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Idazmahaiak</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Aldatu idazmahai izena"
 
@@ -1216,9 +1235,6 @@ msgstr "Ezin da laguntza-elkarrizketa abiarazi: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Aldatu izena"
 
-#~ msgid "Name:"
-#~ msgstr "Izena:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Klikatu idazmahai izenean editatzeko"
 
@@ -1234,9 +1250,6 @@ msgstr "Ezin da laguntza-elkarrizketa abiarazi: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Idazmahai eta marjinak"
 
-#~ msgid "Margins"
-#~ msgstr "Marjinak"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Leiho kudeatzaile ezarpenak"
 
diff --git a/po/fa.po b/po/fa.po
index 0cdde07..130f8f8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:42+0900\n"
 "Last-Translator: Abbas Izad <abbasizad at hotmail.com>\n"
 "Language-Team: Persian <translation-team-fa at lists.sourceforge.net>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "X-Generator: KBabel 1.3\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,279 +79,278 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "مدیر پنجره‌"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "مدیر پنجره‌"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "تعداد فضاهای کاری:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "فضاهای کاری"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "حرکت دادن آهسته و تغییر اندازه"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "طرح دکمه"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "عمل دوکلیکه"
+msgid "<b>_Theme</b>"
+msgstr "هم‌ترازی عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "مدل تمرکز"
+msgid "<b>Title fon_t</b>"
+msgstr "قلم‌نگارش عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "تمرکز پنجره‌ی جدید"
+msgid "<b>Title _alignment</b>"
+msgstr "هم‌ترازی عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "برافرازی با کلیک کردن"
+msgid "Click and drag the buttons to change the layout"
+msgstr "برای تغییر طرح دکمه‌ها را کلیک و بکشانید"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "برافرازی با تمرکز"
+msgid "Title"
+msgstr "عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "هم‌ترازی عنوان"
+msgid "The window title cannot be removed"
+msgstr "عنوان پنجره نمیتواند برداشته شود"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "قلم‌نگارش عنوان"
+msgid "Active"
+msgstr "فعال"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "میانبرهای پنجره‌ها"
+msgid "Menu"
+msgstr "فهرست"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "پنجره‌ربائی"
+msgid "Stick"
+msgstr "چسباندن"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "پیچیدن فضاهای کاری"
+msgid "Shade"
+msgstr "سایه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "هم‌ترازی عنوان"
+msgid "Minimize"
+msgstr "بز_رگ‌سازی"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "بزرگ‌سازی"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "بستن"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "پنهان"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "طرح دکمه"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "سبک"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "کوچک"
+msgid "<b>Window _shortcuts</b>"
+msgstr "میانبرهای پنجره‌ها"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "فاصله :"
+msgid "Ke_yboard"
+msgstr "صفحه‌کلید"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "فعال"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "کلیک برای تمرکز"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "پیشرفته"
+msgid "Focus follows _mouse"
+msgstr "تمرکز بدنبال موشی"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "برافرازی پنجره بطور خودکار وقتی آنها تمرکز را دریافت میکنند"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "تمرکز دادن خودکار به پنجره‌هایی که بتازگی ایجاد شده‌اند"
+msgid "_Delay before window receives focus:"
+msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "کلیک برای تمرکز"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "برای تغییر طرح دکمه‌ها را کلیک و بکشانید"
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "بستن"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "مدل تمرکز"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "تمرکز دادن خودکار به پنجره‌هایی که بتازگی ایجاد شده‌اند"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "فاصله :"
+msgid "<b>New window focus</b>"
+msgstr "تمرکز پنجره‌ی جدید"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "تمرکز بدنبال موشی"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "برافرازی پنجره بطور خودکار وقتی آنها تمرکز را دریافت میکنند"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "پنهان"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+msgid "<b>Raise on focus</b>"
+msgstr "برافرازی با تمرکز"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
+msgid "Raise window when clicking _inside application window"
+msgstr "برافرازی پنجره وقتی داخل پنجره‌ی برنامه کلیک شود"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "صفحه‌کلید"
+msgid "<b>Raise on click</b>"
+msgstr "برافرازی با کلیک کردن"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "بزرگ‌سازی"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "تمرکز"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "فهرست"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "ربودن پنجره به کنار صفحه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "بز_رگ‌سازی"
+msgid "Snap windows to other _windows"
+msgstr "ربودن پنجره‌ها به پنجره‌های دیگر"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "برافرازی پنجره وقتی داخل پنجره‌ی برنامه کلیک شود"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "سایه"
+msgid "Dis_tance:"
+msgstr "فاصله :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "ربودن پنجره‌ها به پنجره‌های دیگر"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "ربودن پنجره به کنار صفحه"
+msgid "<i>Small</i>"
+msgstr "کوچک"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "چسباندن"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "فاصله :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "عملی که هنگام دوکلیکه کردن بر نوار عنوان انجام می‌گردد :"
+msgid "<b>Windows snapping</b>"
+msgstr "پنجره‌ربائی"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "عنوان پنجره نمیتواند برداشته شود"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "عنوان"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "پیچیدن فضاهای کاری وقتی که پنجره‌ای به خارج از صفحه کشیده شود"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "مقاومت لبه :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "پیچیدن فضاهای کاری"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
+msgid "Hide content of windows when _resizing"
+msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "وقفه‌ی پیش از برافرازی پنجره‌ی تمرکز یافته :"
+msgid "Hide content of windows when _moving"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "مقاومت لبه :"
+msgid "<b>Box move and resize</b>"
+msgstr "حرکت دادن آهسته و تغییر اندازه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "تمرکز"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "عملی که هنگام دوکلیکه کردن بر نوار عنوان انجام می‌گردد :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "عمل دوکلیکه"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "سبک"
+msgid "Ad_vanced"
+msgstr "پیشرفته"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -738,48 +737,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "انتقال پنجره به فضای کاری بعدی"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "ساختن میانبر"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "انتقال پنجره به فضای کاری بعدی"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "انتقال پنجره به فضای کاری ۱"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -787,167 +788,173 @@ msgid "Do _nothing"
 msgstr "هیچی"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "انتقال پنجره به فضای کاری ۱"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "فضاهای کاری"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "پیچیدن فضاهای کاری وقتی که اشاره‌گر به لبه‌ی صفحه برسد"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "انتقال پنجره به فضای کاری بعدی"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "نمایش محتویات پنجره‌ها هنگام تغییر اندازه"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "نمایش محتویات پنجره‌ها هنگام حرکت دادن آنها"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "فضاهای کاری"
+msgid "C_ompositor"
+msgstr "ساختن میانبر"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "حاشیه‌ها"
+msgid "_Number of workspaces:"
+msgstr "تعداد فضاهای کاری:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "پیچیدن فضاهای کاری"
+msgid "Names"
+msgstr "نام:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "حاشیه‌ها مناطقی بر لبه‌های صفحه هستند که پنجره‌ها در آنجا گذارده نخواهند شد."
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "تعداد فضاهای کاری:"
+msgid "_Margins"
+msgstr "حاشیه‌ها"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -955,36 +962,36 @@ msgstr "تعداد فضاهای کاری:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "مدیر پنجره‌"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1128,6 +1135,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "تعداد فضاهای کاری:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "حاشیه‌ها"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "پیچیدن فضاهای کاری"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "نام‌های فضای‌کاری"
 
@@ -1239,10 +1258,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "تغییر نام"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "نام:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "بر نام فضای کاریی برای ویرایش آن کلیک کنید"
 
@@ -1262,10 +1277,6 @@ msgstr ""
 #~ msgstr "فضاهای کاری و حاشیه‌ها"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "حاشیه‌ها"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "مدیر پنجره‌"
 
diff --git a/po/fi.po b/po/fi.po
index 9f3bbc7..147c6db 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-12-07 15:40+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <xfce-i18n at xfce.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -81,238 +81,238 @@ msgid "Settings manager socket"
 msgstr "Asetustenhallinnan pistoke"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Muokkaa ikkunoiden käytöstä ja pikanäppäimiä"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Ikkunamanageri"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Hienosäädä ikkunoiden käytöstä ja tehosteita"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Muokkaa ikkunoiden käytöstä ja pikanäppäimiä"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ikkunamanagerin viritys"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Muokkaa työtilojen määrää ja nimiä"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Hienosäädä ikkunoiden käytöstä ja tehosteita"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Työtilat"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Siirto- ja kokolaatikko</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Painikkeiden asettelu</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>K_aksoisnapsautus</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Teema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Kohdistustapa</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Otsakkeen _kirjasin</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Uuden ikkunan kohdistus</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Otsakkeen ta_saus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Nosta napsauttaessa</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Raahaa painikkeita muuttaaksesi asettelua"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Nosta kohdistaessa</b>"
+msgid "Title"
+msgstr "Otsake"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Otsakkeen ta_saus</b>"
+msgid "The window title cannot be removed"
+msgstr "Ikkunan otsaketta ei voi poistaa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Otsakkeen _kirjasin</b>"
+msgid "Active"
+msgstr "Esillä"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Ikkunoiden _pikanäppäimet</b>"
+msgid "Menu"
+msgstr "Valikko"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Ikkunoiden loksahtaminen</b>"
+msgid "Stick"
+msgstr "Kiinnitä"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Kierrätä työtiloja</b>"
+msgid "Shade"
+msgstr "Varjosta"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Teema</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "_Pienennä"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Suurenna"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Pitkä</i>"
+msgid "Close"
+msgstr "Sulje"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Piilotettu"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Lyhyt</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Painikkeiden asettelu</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Tyyli"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Pieni</i>"
+msgid "_Reset to Defaults"
+msgstr "Palauta _oletukset"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Ikkunoiden _pikanäppäimet</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Suuri</i>"
+msgid "Ke_yboard"
+msgstr "_Näppäimistö"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Esillä"
+msgid "Clic_k to focus"
+msgstr "Kohdistus na_psauttaessa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Lisäasetukset"
+msgid "Focus follows _mouse"
+msgstr "Kohdistus seuraa _hiirtä"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Nosta ikkunat automaattisesti, kun niihin kohdistetaan"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Kohdista automaattisesti j_uuri luotuihin ikkunoihin"
+msgid "_Delay before window receives focus:"
+msgstr "_Viive ennen ikkunan kohdistamista"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kohdistus na_psauttaessa"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Raahaa painikkeita muuttaaksesi asettelua"
+msgid "<i>Short</i>"
+msgstr "<i>Lyhyt</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Sulje"
+msgid "<i>Long</i>"
+msgstr "<i>Pitkä</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Kohdistustapa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "_Viive ennen kohdistetun ikkunan nostoa:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Kohdista automaattisesti j_uuri luotuihin ikkunoihin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Etäisyys:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Uuden ikkunan kohdistus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Kohdistus seuraa _hiirtä"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Nosta ikkunat automaattisesti, kun niihin kohdistetaan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Piilotettu"
+msgid "Delay _before raising focused window:"
+msgstr "_Viive ennen kohdistetun ikkunan nostoa:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Piilota ikkunan sisältö sii_rrettäessä"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Nosta kohdistaessa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Piilota ikkunan sisältö kokoa _muutettaessa"
+msgid "Raise window when clicking _inside application window"
+msgstr "Nosta sovellusikkuna, kun sen s_isällä napsautetaan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Näppäimistö"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Nosta napsauttaessa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Suurenna"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Kohdistus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Valikko"
+msgid "Snap windows to screen _border"
+msgstr "Loksauta ikkunat näytön _reunaan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "_Pienennä"
+msgid "Snap windows to other _windows"
+msgstr "Loksauta i_kkunat toisiinsa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Nosta sovellusikkuna, kun sen s_isällä napsautetaan"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Varjosta"
+msgid "Dis_tance:"
+msgstr "_Etäisyys:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Loksauta i_kkunat toisiinsa"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Loksauta ikkunat näytön _reunaan"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Pieni</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Kiinnitä"
+msgid "<i>Wide</i>"
+msgstr "<i>Suuri</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Toiminto, joka suoritetaan kaksoisnapsautettaessa otsikkopalkkia"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Ikkunoiden loksahtaminen</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Ikkunan otsaketta ei voi poistaa"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Vaihda työtilaa _osoittimen saavuttaessa näytön reunan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Otsake"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Vaihda työtilaa, kun ikkuna _raahataan ulos näytöltä"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "R_eunan vastus:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Kierrätä työtiloja</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Vaihda työtilaa _osoittimen saavuttaessa näytön reunan"
+msgid "Hide content of windows when _resizing"
+msgstr "Piilota ikkunan sisältö kokoa _muutettaessa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Viive ennen ikkunan kohdistamista"
+msgid "Hide content of windows when _moving"
+msgstr "Piilota ikkunan sisältö sii_rrettäessä"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "R_eunan vastus:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Siirto- ja kokolaatikko</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Kohdistus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Toiminto, joka suoritetaan kaksoisnapsautettaessa otsikkopalkkia"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Palauta _oletukset"
+msgid "<b>Double click _action</b>"
+msgstr "<b>K_aksoisnapsautus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Tyyli"
+msgid "Ad_vanced"
+msgstr "_Lisäasetukset"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -655,200 +655,210 @@ msgstr ""
 "Tämä palauttaa kaikki pikanäppäimet oletusarvoihinsa. Haluatko varmasti "
 "tehdä tämän?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Suuri</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Läpinäkymätön</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "_Ohita työtilan vaihtajasta tai tehtäväpalkista piilotetut ikkunat"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Sisällytä piilotetut (pienennetyt) ikkunat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Läpinäkyvä</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Selaa k_aikkien työtilojen ikkunoita"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Käytä kohdistuksen _ryöstön estoa"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Piirrä selatessa kehys valitun ikkunan ympärille"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Ruudun _keskelle"
+msgid "C_ycling"
+msgstr "_Selaaminen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Ikkunan oletussijoitus:"
+msgid "Activate _focus stealing prevention"
+msgstr "Käytä kohdistuksen _ryöstön estoa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_omposoija"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Noudata standardia I_CCCM -kohdistusvihjettä"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Selaaminen"
+msgid "When a window raises itself:"
+msgstr "Kun ikkuna hyppää esiin:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Selaa k_aikkien työtilojen ikkunoita"
+msgid "_Bring window on current workspace"
+msgstr "Siirrä ikkuna _nykyiseen työtilaan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Näytä kokoruudun _peittokuvaikkunat suoraan"
+msgid "Switch to win_dow's workspace"
+msgstr "Siirry i_kkunan työtilaan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Älä tee _mitään"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Piilota ikkunan ke_hys suurennettaessa"
+msgid "Key used to _grab and move windows:"
+msgstr "Ikkunoi_den liikutteluun käytettävä näppäin:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Noudata standardia I_CCCM -kohdistusvihjettä"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Kaikki hiiren painikkeet nostavat ikkunan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Pidä huomiota vaativat ikkunat _vilkkuvina"
+msgid "Hide _frame of windows when maximized"
+msgstr "Piilota ikkunan ke_hys suurennettaessa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Ikkunoi_den liikutteluun käytettävä näppäin:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Palauta suure_nnettujen ikkunoiden koko siirrettäessä"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Ilmoita _huomion tarpeesta vilkuttamalla ikkunan reunoja"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Käytä r_eunavastusta ikkunoiden loksahtamisen sijaan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Ikkunoiden kehys_ten läpinäkyvyys:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Ilmoita _huomion tarpeesta vilkuttamalla ikkunan reunoja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Epäaktii_visten ikkunoiden läpinäkyvyys:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Pidä huomiota vaativat ikkunat _vilkkuvina"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "P_onnahdusikkunoiden läpinäkyvyys:"
+msgid "_Accessibility"
+msgstr "_Esteettömyys"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Ikkunoiden läpinäkyvyys sii_rrettäessä:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "_Hiiren rulla työpöydän yllä vaihtaa työtilaa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Ikkunoiden läpinäkyvyys kokoa m_uutettaessa:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Palauta suure_nnettujen ikkunoiden koko siirrettäessä"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr "M_uista edellinen työtila pikanäppäimillä vaihdettaessa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Näytä varjot te_lakkaikkunoiden alla"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Kierrätä työtiloja t_yöpöytäasettelun mukaisesti"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Näytä varjot ta_vallisten ikkunoiden alla"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Kierrätä työtiloja, kun o_hitetaan ensimmäinen tai viimeinen tila"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Näytä varjot ponnahd_usikkunoiden alla"
+msgid "_Workspaces"
+msgstr "_Työtilat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Siirry i_kkunan työtilaan"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "_Osoittimen alle"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Käytä r_eunavastusta ikkunoiden loksahtamisen sijaan"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "_Hiiren rulla työpöydän yllä vaihtaa työtilaa"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Älykkäästi sijoitettavan ikkunan _minimikoko:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Kun ikkuna hyppää esiin:"
+msgid "<i>Large</i>"
+msgstr "<i>Suuri</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Ikkunan oletussijoitus:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Kierrätä työtiloja t_yöpöytäasettelun mukaisesti"
+msgid "At the _center of the screen"
+msgstr "Ruudun _keskelle"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Kierrätä työtiloja, kun o_hitetaan ensimmäinen tai viimeinen tila"
+msgid "Under the mouse _pointer"
+msgstr "_Osoittimen alle"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Esteettömyys"
+msgid "_Placement"
+msgstr "_Sijoittelu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Siirrä ikkuna _nykyiseen työtilaan"
+msgid "_Enable display compositing"
+msgstr "Käytä näytön ko_mposointia"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Piirrä selatessa kehys valitun ikkunan ympärille"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Näytä kokoruudun _peittokuvaikkunat suoraan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Käytä näytön ko_mposointia"
+msgid "Show shadows under _regular windows"
+msgstr "Näytä varjot ta_vallisten ikkunoiden alla"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Näytä varjot ponnahd_usikkunoiden alla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Sisällytä piilotetut (pienennetyt) ikkunat"
+msgid "Show shadows under _dock windows"
+msgstr "Näytä varjot te_lakkaikkunoiden alla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Älykkäästi sijoitettavan ikkunan _minimikoko:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Ikkunoiden kehys_ten läpinäkyvyys:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Sijoittelu"
+msgid "<i>Transparent</i>"
+msgstr "<i>Läpinäkyvä</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Kaikki hiiren painikkeet nostavat ikkunan"
+msgid "<i>Opaque</i>"
+msgstr "<i>Läpinäkymätön</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr "M_uista edellinen työtila pikanäppäimillä vaihdettaessa"
+msgid "Opacity of _inactive windows:"
+msgstr "Epäaktii_visten ikkunoiden läpinäkyvyys:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Ikkunoiden läpinäkyvyys sii_rrettäessä:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "_Ohita työtilan vaihtajasta tai tehtäväpalkista piilotetut ikkunat"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Ikkunoiden läpinäkyvyys kokoa m_uutettaessa:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "P_onnahdusikkunoiden läpinäkyvyys:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Työtilat"
+msgid "C_ompositor"
+msgstr "K_omposoija"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Reunukset</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Työtilojen luku_määrä:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Työtilat</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nimi:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Reunukset ovat näytön reunoilla olevat alueet, joille ikkunoita ei aseteta"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Työtilojen luku_määrä:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Reunukset</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -856,35 +866,35 @@ msgstr "Työtilojen luku_määrä:"
 msgid "%s (on %s)"
 msgstr "%s (isäntäkoneella %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Haaraudu taustalle"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Haaraudu taustalle (ei tuettu)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Aseta komposointitila"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Aseta komposointitila (ei tuettu)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Korvaa nykyinen ikkunamanageri"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Tulosta versiotiedot ja poistu"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[VALITSIMET...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Saat käyttöohjeita komennolla \"%s --help\"."
@@ -1016,12 +1026,15 @@ msgstr "Virhe luettaessa lapsiprosessin tietoa: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Apudialogia ei voi avata: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Muokkaa työtilojen määrää ja nimiä"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Työtilat</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Vaihda työtilan nimi"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nimi:"
-
 #~ msgid "Hide"
 #~ msgstr "Piilota"
 
diff --git a/po/fr.po b/po/fr.po
index a6aa630..a550dd0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,19 +4,19 @@
 # Olivier Fourdan <fourdan at xfce.org>, 2002-2006.
 # Maximilian Schleiss <maximilian at xfce.org>, 2006-2008.
 # Mike Massonnet <mmassonnet at xfce.org>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-01 11:39+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-01-18 16:24+0100\n"
 "Last-Translator: Jérôme Guelfucci <jeromeg at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -84,241 +84,241 @@ msgid "Settings manager socket"
 msgstr "Socket du gestionnaire de paramètres"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configurer le comportement des fenêtres et les raccourcis"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ajuster le comportement des fenêtres et leurs effets"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configurer le comportement des fenêtres et les raccourcis"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Peaufinage des fenêtres"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Régler le nombre et les noms des espaces de travail"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ajuster le comportement des fenêtres et leurs effets"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Espaces de travail"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Déplacement et redimensionnement de la fenêtre</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Agencement des boutons</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Action du double clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Thème</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modèle de focus</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Police du _titre</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Focus sur les nouvelles fenêtres</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Alignement du titre</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Fenêtres au premier plan lors d'un clic</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Cliquer et faire glisser les boutons pour modifier l'agencement"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Fenêtres au premier plan lors du focus</b>"
+msgid "Title"
+msgstr "Titre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Alignement du titre</b>"
+msgid "The window title cannot be removed"
+msgstr "Le titre de la fenêtre ne peut être supprimé"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Police du _titre</b>"
+msgid "Active"
+msgstr "Actifs"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Raccourci_s de fenêtres</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Aimantation des fenêtres</b>"
+msgid "Stick"
+msgstr "Coller"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Basculer d'espace de travail</b>"
+msgid "Shade"
+msgstr "Enrouler"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Thème</b>"
+msgid "Minimize"
+msgstr "Réduire"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximiser"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Long</i>"
+msgid "Close"
+msgstr "Fermer"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Éléments masqués"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Court</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Agencement des boutons</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Style"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Petit</i>"
+msgid "_Reset to Defaults"
+msgstr "_Réinitialiser aux valeurs par défaut"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Raccourci_s de fenêtres</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Grand</i>"
+msgid "Ke_yboard"
+msgstr "Cla_vier"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Actifs"
+msgid "Clic_k to focus"
+msgstr "_Cliquer pour donner le focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vancé"
+msgid "Focus follows _mouse"
+msgstr "Le focus suit la _souris"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Placer les fenêtres automatiquement au premier plan lorsqu'elles _reçoivent "
-"le focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Donner le focus automatiquement sur les _nouvelles fenêtres"
+msgid "_Delay before window receives focus:"
+msgstr "_Délai avant le focus sur la fenêtre :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Cliquer pour donner le focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Cliquer et faire glisser les boutons pour modifier l'agencement"
+msgid "<i>Short</i>"
+msgstr "<i>Court</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Fermer"
+msgid "<i>Long</i>"
+msgstr "<i>Long</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modèle de focus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Délai _avant la mise au premier plan :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Donner le focus automatiquement sur les _nouvelles fenêtres"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tance :"
+msgid "<b>New window focus</b>"
+msgstr "<b>Focus sur les nouvelles fenêtres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Le focus suit la _souris"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"Placer les fenêtres automatiquement au premier plan lorsqu'elles _reçoivent "
+"le focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Éléments masqués"
+msgid "Delay _before raising focused window:"
+msgstr "Délai _avant la mise au premier plan :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "_Cacher le contenu des fenêtres lors de leur déplacement"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Fenêtres au premier plan lors du focus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Cacher le contenu des fenêtres lors du _redimensionnement"
+msgid "Raise window when clicking _inside application window"
+msgstr "Placer les fenêtres au premier plan en cl_iquant à l'intérieur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Cla_vier"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Fenêtres au premier plan lors d'un clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximiser"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Accrocher les fenêtres aux _bords de l'écran"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Réduire"
+msgid "Snap windows to other _windows"
+msgstr "_Accrocher les fenêtres aux autres fenêtres"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Placer les fenêtres au premier plan en cl_iquant à l'intérieur"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrouler"
+msgid "Dis_tance:"
+msgstr "Dis_tance :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "_Accrocher les fenêtres aux autres fenêtres"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Accrocher les fenêtres aux _bords de l'écran"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Petit</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Coller"
+msgid "<i>Wide</i>"
+msgstr "<i>Grand</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Action à effectuer lors d'un double clic sur la barre de titre"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Aimantation des fenêtres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Le titre de la fenêtre ne peut être supprimé"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Changer d'espace de travail lorsque le _pointeur arrive au bord de l'écran"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titre"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Changer d'espace de travail en _déplaçant une fenêtre au bord de l'écran"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Résistance aux bords :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Basculer d'espace de travail</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Changer d'espace de travail lorsque le _pointeur arrive au bord de l'écran"
+msgid "Hide content of windows when _resizing"
+msgstr "Cacher le contenu des fenêtres lors du _redimensionnement"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Délai avant le focus sur la fenêtre :"
+msgid "Hide content of windows when _moving"
+msgstr "_Cacher le contenu des fenêtres lors de leur déplacement"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Résistance aux bords :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Déplacement et redimensionnement de la fenêtre</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Focus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Action à effectuer lors d'un double clic sur la barre de titre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Réinitialiser aux valeurs par défaut"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Action du double clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Style"
+msgid "Ad_vanced"
+msgstr "A_vancé"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -656,211 +656,221 @@ msgstr ""
 "Voulez-vous vraiment réinitialiser tous les raccourcis à leur valeur par "
 "défaut ?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Large</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaque</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Ignorer les fenêtres qui ont les propriétés\n"
+"\"skip pager\" ou \"skip taskbar\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Inclure les fenêtres réduites"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparent</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Naviguer parmi les fenêtres de _tous les espaces de travail"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activer la prévention d'acquisition du _focus"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Dessiner un cadre autour des fenêtres sélectionnées lors de la navigation"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "au _centre de l'écran"
+msgid "C_ycling"
+msgstr "_Navigation"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Par défaut, placer la fenêtre :"
+msgid "Activate _focus stealing prevention"
+msgstr "Activer la prévention d'acquisition du _focus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositeur"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Suivre le _standard ICCCM pour le focus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Navigation"
+msgid "When a window raises itself:"
+msgstr "Lorsqu'une fenêtre se met au premier plan :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Naviguer parmi les fenêtres de _tous les espaces de travail"
+msgid "_Bring window on current workspace"
+msgstr "_Placer la fenêtre dans l'espace de travail actif"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Affichage direct des _fenêtres plein écran"
+msgid "Switch to win_dow's workspace"
+msgstr "Aller à l'espace _de travail de la fenêtre"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Ne rien faire"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "_Masquer la bordure des fenêtres maximisées"
+msgid "Key used to _grab and move windows:"
+msgstr "Touche utilisée pour _saisir et déplacer les fenêtres :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Suivre le _standard ICCCM pour le focus"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Placer les fenêtres au premier plan lorsque la souris est cliquée"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Laisser clignoter les fenêtres _urgentes"
+msgid "Hide _frame of windows when maximized"
+msgstr "_Masquer la bordure des fenêtres maximisées"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Touche utilisée pour _saisir et déplacer les fenêtres :"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"_Restaurer la taille originale des fenêtres maximisées lors de leur "
+"déplacement"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Signaler une _urgence en faisant clignoter la décoration de la fenêtre"
+msgid "Use _edge resistance instead of window snapping"
+msgstr ""
+"_Utiliser la résistance aux bords au lieu de l'aimantation entre les fenêtres"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_té des décorations des fenêtres :"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Signaler une _urgence en faisant clignoter la décoration de la fenêtre"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacité des fenêtres _inactives :"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Laisser clignoter les fenêtres _urgentes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacité des fenêtres contextuelle_s :"
+msgid "_Accessibility"
+msgstr "_Accessibilité"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacité des fenêtres durant leur déplace_ment :"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Changer d'espace de travail à l'aide de la _molette de la souris sur le "
+"bureau"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacité des fenêtres durant leur _redimensionnement :"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"_Restaurer la taille originale des fenêtres maximisées lors de leur "
-"déplacement"
+"_Mémoriser et revenir à l'espace précédent\n"
+"en changeant d'espace de travail à l'aide du clavier"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Afficher l'ombre sous les fenêtres du _dock"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Changer d'espace de travail en fonction de l'_agencement du bureau"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Afficher l'ombre sous les fenêtres no_rmales"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Changer d'espace de travail après en avoir atteint le _premier ou le dernier"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Afficher l'ombre sous les fenêtres context_uelles"
+msgid "_Workspaces"
+msgstr "_Espaces de travail"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Aller à l'espace _de travail de la fenêtre"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sous le _pointeur de la souris"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr ""
-"_Utiliser la résistance aux bords au lieu de l'aimantation entre les fenêtres"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Changer d'espace de travail à l'aide de la _molette de la souris sur le "
-"bureau"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Taille _minimale des fenêtres placées intelligemment :"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Lorsqu'une fenêtre se met au premier plan :"
+msgid "<i>Large</i>"
+msgstr "<i>Large</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Par défaut, placer la fenêtre :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Changer d'espace de travail en fonction de l'_agencement du bureau"
+msgid "At the _center of the screen"
+msgstr "au _centre de l'écran"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Changer d'espace de travail après en avoir atteint le _premier ou le dernier"
+msgid "Under the mouse _pointer"
+msgstr "Sous le _pointeur de la souris"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accessibilité"
+msgid "_Placement"
+msgstr "_Placement"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Placer la fenêtre dans l'espace de travail actif"
+msgid "_Enable display compositing"
+msgstr "_Activer le compositeur d'affichage"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
-"_Dessiner un cadre autour des fenêtres sélectionnées lors de la navigation"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Affichage direct des _fenêtres plein écran"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Activer le compositeur d'affichage"
+msgid "Show shadows under _regular windows"
+msgstr "Afficher l'ombre sous les fenêtres no_rmales"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Afficher l'ombre sous les fenêtres context_uelles"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Inclure les fenêtres réduites"
+msgid "Show shadows under _dock windows"
+msgstr "Afficher l'ombre sous les fenêtres du _dock"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Taille _minimale des fenêtres placées intelligemment :"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_té des décorations des fenêtres :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Placement"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparent</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Placer les fenêtres au premier plan lorsque la souris est cliquée"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaque</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Mémoriser et revenir à l'espace précédent\n"
-"en changeant d'espace de travail à l'aide du clavier"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacité des fenêtres _inactives :"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacité des fenêtres durant leur déplace_ment :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Ignorer les fenêtres qui ont les propriétés\n"
-"\"skip pager\" ou \"skip taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacité des fenêtres durant leur _redimensionnement :"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacité des fenêtres contextuelle_s :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Espaces de travail"
+msgid "C_ompositor"
+msgstr "C_ompositeur"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marges</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Nombre d'espaces de travail :"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Espaces de travail</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nom :"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Les marges sont des zones au bord de l'écran où aucune fenêtre ne sera placée"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Nombre d'espaces de travail :"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Marges</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -868,35 +878,35 @@ msgstr "_Nombre d'espaces de travail :"
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Forker en arrière-plan"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Forker en arrière-plan (non supporté)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Appliquer le mode du compositeur"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Appliquer le mode du compositeur (non supporté)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Remplacer le gestionnaire de fenêtre actuel"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Information sur la version et quitter"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Saisissez \"%s --help\" pour l'usage."
@@ -1032,12 +1042,15 @@ msgstr "Erreur lors de la lecture des données du processus fils : %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Impossible de démarrer la fenêtre d'aide : %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Régler le nombre et les noms des espaces de travail"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Espaces de travail</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Renommer l'espace de travail"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nom :"
-
 #~ msgid "Hide"
 #~ msgstr "Iconifier"
 
diff --git a/po/gl.po b/po/gl.po
index 47d6ae1..a49e66d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-10-19 19:01+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -87,242 +87,242 @@ msgid "Settings manager socket"
 msgstr "Conectador do xestor de configuración"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configurar o comportamento e os atallos das xanelas"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Xestor de xanelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Afinar o comportamento e os efectos das xanelas"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configurar o comportamento e os atallos das xanelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Axustes do xestor de xanelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Definir o número e os nomes dos espazos de traballo"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Afinar o comportamento e os efectos das xanelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Espazos de traballo"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Movemento e redimensionamento das caixas</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Disposición dos botóns</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Acción do dobre clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modelo de foco</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Tipo de letra do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Foco de xanela nova</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Aliñamento do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Elevar ao premer</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Premer e arrastrar os botóns para cambiar a súa disposición"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Elevar ao recibir o foco</b>"
+msgid "Title"
+msgstr "Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Aliñamento do título</b>"
+msgid "The window title cannot be removed"
+msgstr "Non se pode eliminar o título da xanela"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Tipo de letra do título</b>"
+msgid "Active"
+msgstr "Activo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>A_tallos das xanelas</b>"
+msgid "Menu"
+msgstr "Menú"
 
+# fixar
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Axuste das xanelas</b>"
+msgid "Stick"
+msgstr "Fixar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Dividir os espazos de traballo</b>"
+msgid "Shade"
+msgstr "Sombra"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Mi_nimizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Longa</i>"
+msgid "Close"
+msgstr "Pechar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Oculto"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Curta</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Disposición dos botóns</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Pequeno</i>"
+msgid "_Reset to Defaults"
+msgstr "_Restablecer as predefinicións"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>A_tallos das xanelas</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Grande</i>"
+msgid "Ke_yboard"
+msgstr "_Teclado"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Activo"
+msgid "Clic_k to focus"
+msgstr "Pre_ma para enfocar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vanzado"
+msgid "Focus follows _mouse"
+msgstr "O foco segue ao _rato"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Elevar automaticamente as xanelas cando obteñen o foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Concederlle o foco automaticamente ás _novas xanelas creadas"
+msgid "_Delay before window receives focus:"
+msgstr "_Demora antes de que a xanela obteña o foco:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Pre_ma para enfocar"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Premer e arrastrar os botóns para cambiar a súa disposición"
+msgid "<i>Short</i>"
+msgstr "<i>Curta</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Pechar"
+msgid "<i>Long</i>"
+msgstr "<i>Longa</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modelo de foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Demora _antes de elevar a xanela que ten o foco:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Concederlle o foco automaticamente ás _novas xanelas creadas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Distancia:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Foco de xanela nova</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "O foco segue ao _rato"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Elevar automaticamente as xanelas cando obteñen o foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Oculto"
+msgid "Delay _before raising focused window:"
+msgstr "Demora _antes de elevar a xanela que ten o foco:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ocultar o contido das xanelas ao _movelas"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Elevar ao recibir o foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ocultar o contido das xanelas ao _redimensionalas"
+msgid "Raise window when clicking _inside application window"
+msgstr "Elevar a xanela ao premer _dentro da xanela do aplicativo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Teclado"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Elevar ao premer</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menú"
+msgid "Snap windows to screen _border"
+msgstr "Axustar as xanelas aos _bordos da pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Mi_nimizar"
+msgid "Snap windows to other _windows"
+msgstr "Axustar as xanelas a outras _xanelas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Elevar a xanela ao premer _dentro da xanela do aplicativo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Sombra"
+msgid "Dis_tance:"
+msgstr "_Distancia:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Axustar as xanelas a outras _xanelas"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Axustar as xanelas aos _bordos da pantalla"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Pequeno</i>"
 
-# fixar
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Fixar"
+msgid "<i>Wide</i>"
+msgstr "<i>Grande</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "A acción a realizar cando se fai dobre clic sobre a barra de título"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Axuste das xanelas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Non se pode eliminar o título da xanela"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Dividir os espazos de traballo cando o _punteiro chega ao bordo da pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Título"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "_Dividir os espazos de traballo cando se arrastre unha xanela fóra da "
 "pantalla"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "R_esistencia do bordo:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Dividir os espazos de traballo</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Dividir os espazos de traballo cando o _punteiro chega ao bordo da pantalla"
+msgid "Hide content of windows when _resizing"
+msgstr "Ocultar o contido das xanelas ao _redimensionalas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Demora antes de que a xanela obteña o foco:"
+msgid "Hide content of windows when _moving"
+msgstr "Ocultar o contido das xanelas ao _movelas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "R_esistencia do bordo:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Movemento e redimensionamento das caixas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Foco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "A acción a realizar cando se fai dobre clic sobre a barra de título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Restablecer as predefinicións"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Acción do dobre clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stilo"
+msgid "Ad_vanced"
+msgstr "A_vanzado"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -665,211 +665,221 @@ msgid ""
 msgstr ""
 "Isto restablecerá as predefinicións de todos os atallos. Desexa facer isto?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Grande</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaco</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Saltar as xanelas que teñan definidas\n"
+"as propiedades \"saltar o paxinador\"\n"
+"ou \"saltar a barra de tarefas\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Incluír as xanelas ocultas (iconizadas)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Percorrer as xanelas de todos os espazos de traballo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activar a prevención de roubo de _foco"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Debuxar un marco arredor da xanela seleccionada ao percorrelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "No _centro da pantalla"
+msgid "C_ycling"
+msgstr "_Percorrido"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Por defecto, situar as xanelas:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activar a prevención de roubo de _foco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Cumprir as recomendacións de foco do _estándar ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Percorrido"
+msgid "When a window raises itself:"
+msgstr "Cando unha xanela se eleva:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Percorrer as xanelas de todos os espazos de traballo"
+msgid "_Bring window on current workspace"
+msgstr "_Traer a xanela ao espazo de traballo actual"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Mostrar directamente as xanelas sobrepostas a _pantalla completa"
+msgid "Switch to win_dow's workspace"
+msgstr "Cambiar ao _espazo de traballo da xanela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Non facer nada"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ocultar o _marco das xanelas ao maximizalas"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla que se usa para _seleccionar e mover as xanelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Cumprir as recomendacións de foco do _estándar ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Eleva_r as xanelas cando se preme calquera botón do rato"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "As xanelas urxentes _pestanexan indefinidamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ocultar o _marco das xanelas ao maximizalas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla que se usa para _seleccionar e mover as xanelas:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Restablecer o _tamaño orixinal das xanelas maximizadas ao movelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Usar a resistencia do bordo en vez do axuste de xanelas"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
 msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 "Notificar a _urxencia facendo que as decoracións das xanelas pestanexen"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "O_pacidade das decoracións das xanelas:"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacidade das xanelas _inactivas:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "As xanelas urxentes _pestanexan indefinidamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacidade das xanela_s emerxentes:"
+msgid "_Accessibility"
+msgstr "_Accesibilidade"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacidade das xanelas mentres se _moven:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Usar a roda do _rato no escritorio para cambiar de espazo de traballo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacidade das xanelas mentres se _redimensionan:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Restablecer o _tamaño orixinal das xanelas maximizadas ao movelas"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Lembrar e recuperar o espazo de traballo\n"
+"anterior ao cambiar de espazo de traballo\n"
+"usando os atallos de teclado"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostrar sombras detrás das xanelas acoplables"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Dividir os espazos de traballo dependendo da _disposición actual do "
+"escritorio"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostrar sombras detrás das xanelas _normais"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Dividir os _espazos de traballo cando se chega ao primeiro ou ao último"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostrar sombras detrás das xanelas e_merxentes"
+msgid "_Workspaces"
+msgstr "_Espazos de traballo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Cambiar ao _espazo de traballo da xanela"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Baixo o _punteiro do rato"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Usar a resistencia do bordo en vez do axuste de xanelas"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Usar a roda do _rato no escritorio para cambiar de espazo de traballo"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Tamaño mínimo das xanelas para activar a colocación intelixente:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Cando unha xanela se eleva:"
+msgid "<i>Large</i>"
+msgstr "<i>Grande</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Por defecto, situar as xanelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Dividir os espazos de traballo dependendo da _disposición actual do "
-"escritorio"
+msgid "At the _center of the screen"
+msgstr "No _centro da pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Dividir os _espazos de traballo cando se chega ao primeiro ou ao último"
+msgid "Under the mouse _pointer"
+msgstr "Baixo o _punteiro do rato"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accesibilidade"
+msgid "_Placement"
+msgstr "_Colocación"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Traer a xanela ao espazo de traballo actual"
+msgid "_Enable display compositing"
+msgstr "_Activar a composición da pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Debuxar un marco arredor da xanela seleccionada ao percorrelas"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Mostrar directamente as xanelas sobrepostas a _pantalla completa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Activar a composición da pantalla"
+msgid "Show shadows under _regular windows"
+msgstr "Mostrar sombras detrás das xanelas _normais"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostrar sombras detrás das xanelas e_merxentes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Incluír as xanelas ocultas (iconizadas)"
+msgid "Show shadows under _dock windows"
+msgstr "Mostrar sombras detrás das xanelas acoplables"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Tamaño mínimo das xanelas para activar a colocación intelixente:"
+msgid "Opaci_ty of window decorations:"
+msgstr "O_pacidade das decoracións das xanelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Colocación"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Eleva_r as xanelas cando se preme calquera botón do rato"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaco</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Lembrar e recuperar o espazo de traballo\n"
-"anterior ao cambiar de espazo de traballo\n"
-"usando os atallos de teclado"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacidade das xanelas _inactivas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacidade das xanelas mentres se _moven:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Saltar as xanelas que teñan definidas\n"
-"as propiedades \"saltar o paxinador\"\n"
-"ou \"saltar a barra de tarefas\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacidade das xanelas mentres se _redimensionan:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacidade das xanela_s emerxentes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Espazos de traballo"
+msgid "C_ompositor"
+msgstr "C_ompositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marxes</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Número de espazos de traballo:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Espazos de traballo</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nome:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "As marxes son as zonas dos bordos da pantalla nas que non se sitúa ningunha "
 "xanela"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Número de espazos de traballo:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Marxes</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -877,35 +887,35 @@ msgstr "_Número de espazos de traballo:"
 msgid "%s (on %s)"
 msgstr "%s (en %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Substituír o xestor de xanelas existente"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Mostrar información da versión e saír"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTOS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Introduza \"%s --help\" para obter información sobre o modo de uso."
@@ -1037,12 +1047,15 @@ msgstr "Produciuse un erro ao ler datos do proceso fillo: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Non se puido iniciar helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Definir o número e os nomes dos espazos de traballo"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Espazos de traballo</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Cambiar o nome do espazo de traballo"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nome:"
-
 #~ msgid "Hide"
 #~ msgstr "Ocultar"
 
diff --git a/po/gu.po b/po/gu.po
index 63d383e..4369713 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:44+0900\n"
 "Last-Translator: Ankit Patel <ankit at redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
@@ -80,279 +80,278 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "વિન્ડો વ્યવસ્થાપક"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "વિન્ડો વ્યવસ્થાપક"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "કામ કરવાની જગ્યાઓની સંખ્યા:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "કામ કરવાની જગ્યાઓ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "અપારદર્શક રીતે ખસેડો અને માપ બદલો"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "બટનનો દેખાવ"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "બેવડું ક્લિકની ક્રિયા"
+msgid "<b>_Theme</b>"
+msgstr "શીર્ષક ગોઠવણી"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "મોડેલ પર ફોકસ કરો"
+msgid "<b>Title fon_t</b>"
+msgstr "શીર્ષક ફોન્ટ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "નવી વિન્ડો ફોકસ"
+msgid "<b>Title _alignment</b>"
+msgstr "શીર્ષક ગોઠવણી"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "ક્લિક પર વધારો"
+msgid "Click and drag the buttons to change the layout"
+msgstr "દેખાવ બદલવા માટે બટનો પર ક્લિક કરો અને ખેંચો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "ફોકસ પર વધારો"
+msgid "Title"
+msgstr "શીર્ષક"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "શીર્ષક ગોઠવણી"
+msgid "The window title cannot be removed"
+msgstr "વિન્ડો શીર્ષક, તે દૂર કરી શકાતું નથી"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "શીર્ષક ફોન્ટ"
+msgid "Active"
+msgstr "સક્રિય"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "વિન્ડો ટુંકા પથો"
+msgid "Menu"
+msgstr "મેનુ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "વિન્ડો બદલી રહ્યા છીએ"
+msgid "Stick"
+msgstr "લાકડી"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "કામ કરવાની જગ્યાઓને લપેટો"
+msgid "Shade"
+msgstr "પડછાયો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "શીર્ષક ગોઠવણી"
+msgid "Minimize"
+msgstr "મહત્તમ કરો (_x)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "મહત્તમ કરો"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "બંધ કરો"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "છુપુ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "બટનનો દેખાવ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "શૈલી"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "નાનુ"
+msgid "<b>Window _shortcuts</b>"
+msgstr "વિન્ડો ટુંકા પથો"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "અંતર :"
+msgid "Ke_yboard"
+msgstr "કીબોર્ડ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "સક્રિય"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "ફોકસ કરવા માટે ક્લિક કરો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "ઉન્નત"
+msgid "Focus follows _mouse"
+msgstr "ફોકસ માઉસને અનુસરે છે"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "આપોઆપ વિન્ડો મોટી કરો જ્યારે તેઓ ફોકસ થાય"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "નવી બનેલી વિન્ડોને આપોઆપ ફોકસ કરો"
+msgid "_Delay before window receives focus:"
+msgstr "ફોકસ થયેલ વિન્ડો વધારવા પહેલા વિલંબ :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "ફોકસ કરવા માટે ક્લિક કરો"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "દેખાવ બદલવા માટે બટનો પર ક્લિક કરો અને ખેંચો"
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "બંધ કરો"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "મોડેલ પર ફોકસ કરો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "ફોકસ થયેલ વિન્ડો વધારવા પહેલા વિલંબ :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "નવી બનેલી વિન્ડોને આપોઆપ ફોકસ કરો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "અંતર :"
+msgid "<b>New window focus</b>"
+msgstr "નવી વિન્ડો ફોકસ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "ફોકસ માઉસને અનુસરે છે"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "આપોઆપ વિન્ડો મોટી કરો જ્યારે તેઓ ફોકસ થાય"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "છુપુ"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "ફોકસ થયેલ વિન્ડો વધારવા પહેલા વિલંબ :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "<b>Raise on focus</b>"
+msgstr "ફોકસ પર વધારો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "Raise window when clicking _inside application window"
+msgstr "કાર્યક્રમ વિન્ડોની અંદર પર ક્લિક કરો ત્યારે વિન્ડો વધારો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "કીબોર્ડ"
+msgid "<b>Raise on click</b>"
+msgstr "ક્લિક પર વધારો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "મહત્તમ કરો"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "ફોકસ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "મેનુ"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "સ્ક્રીનની કિનારીમાંથી વિન્ડો બદલો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "મહત્તમ કરો (_x)"
+msgid "Snap windows to other _windows"
+msgstr "વિન્ડોને અન્ય વિન્ડોમાં સાંકળો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "કાર્યક્રમ વિન્ડોની અંદર પર ક્લિક કરો ત્યારે વિન્ડો વધારો"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "પડછાયો"
+msgid "Dis_tance:"
+msgstr "અંતર :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "વિન્ડોને અન્ય વિન્ડોમાં સાંકળો"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "સ્ક્રીનની કિનારીમાંથી વિન્ડો બદલો"
+msgid "<i>Small</i>"
+msgstr "નાનુ"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "લાકડી"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "અંતર :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "જ્યારે શીર્ષક પટ્ટી પર બેવડું ક્લિક કરી રહ્યા હોય ત્યારે કરવાની ક્રિયા :"
+msgid "<b>Windows snapping</b>"
+msgstr "વિન્ડો બદલી રહ્યા છીએ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "વિન્ડો શીર્ષક, તે દૂર કરી શકાતું નથી"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "જ્યારે નિર્દેશક સ્ક્રીનની બાજુ પર પહોંચી જાય ત્યારે કામ કરવાની જગ્યાઓને લપેટો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "શીર્ષક"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "જ્યારે વિન્ડોને સ્ક્રીનની બહાર ખેંચી રહ્યા હોય ત્યારે કામ કરવાની જગ્યાઓને લપેટો"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "બાજુનો અવરોધ :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "કામ કરવાની જગ્યાઓને લપેટો"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "જ્યારે નિર્દેશક સ્ક્રીનની બાજુ પર પહોંચી જાય ત્યારે કામ કરવાની જગ્યાઓને લપેટો"
+msgid "Hide content of windows when _resizing"
+msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "ફોકસ થયેલ વિન્ડો વધારવા પહેલા વિલંબ :"
+msgid "Hide content of windows when _moving"
+msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "બાજુનો અવરોધ :"
+msgid "<b>Box move and resize</b>"
+msgstr "અપારદર્શક રીતે ખસેડો અને માપ બદલો"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "ફોકસ"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "જ્યારે શીર્ષક પટ્ટી પર બેવડું ક્લિક કરી રહ્યા હોય ત્યારે કરવાની ક્રિયા :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "બેવડું ક્લિકની ક્રિયા"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "શૈલી"
+msgid "Ad_vanced"
+msgstr "ઉન્નત"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -731,48 +730,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "વિન્ડોને ડાબી કામ કરવાની જગ્યા પર ખસાડો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "ટુંકો પથ બનાવો"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "વિન્ડોને ડાબી કામ કરવાની જગ્યા પર ખસાડો"
+msgid "_Bring window on current workspace"
+msgstr "વિન્ડોને પછીની કામ કરવાની જગ્યા પર ખસાડો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "વિન્ડોને કામ કરવાની જગ્યા %d પર ખસાડો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -780,166 +781,172 @@ msgid "Do _nothing"
 msgstr "કંઈ નથી"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "જ્યારે નિર્દેશક સ્ક્રીનની બાજુ પર પહોંચી જાય ત્યારે કામ કરવાની જગ્યાઓને લપેટો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "વિન્ડોને કામ કરવાની જગ્યા %d પર ખસાડો"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "કામ કરવાની જગ્યાઓ"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "જ્યારે નિર્દેશક સ્ક્રીનની બાજુ પર પહોંચી જાય ત્યારે કામ કરવાની જગ્યાઓને લપેટો"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "વિન્ડોને પછીની કામ કરવાની જગ્યા પર ખસાડો"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "જ્યારે માપ બદલી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "જ્યારે ખસેડી રહ્યા હોય ત્યારે સમાવિષ્ટો પ્રદર્શિત કરો"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "કામ કરવાની જગ્યાઓ"
+msgid "C_ompositor"
+msgstr "ટુંકો પથ બનાવો"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "હાંસિયાઓ"
+msgid "_Number of workspaces:"
+msgstr "કામ કરવાની જગ્યાઓની સંખ્યા:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "કામ કરવાની જગ્યાઓને લપેટો"
+msgid "Names"
+msgstr "નામ:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "હાંસિયાઓ એ સ્ક્રીનની બાજુઓ માટેના વિસ્તારો છે કે જ્યાં કોઈ વિન્ડો મૂકવામાં આવતી નથી"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "કામ કરવાની જગ્યાઓની સંખ્યા:"
+msgid "_Margins"
+msgstr "હાંસિયાઓ"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -947,36 +954,36 @@ msgstr "કામ કરવાની જગ્યાઓની સંખ્યા
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "વિન્ડો વ્યવસ્થાપક"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1120,6 +1127,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "કામ કરવાની જગ્યાઓની સંખ્યા:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "હાંસિયાઓ"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "કામ કરવાની જગ્યાઓને લપેટો"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "કામ કરવાની જગ્યાના નામો"
 
@@ -1231,10 +1250,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "નામ બદલો"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "નામ:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "કામ કરવાની જગ્યાના નામમાં ફેરફાર કરવા માટે તેના પર ક્લિક કરો"
 
@@ -1254,10 +1269,6 @@ msgstr ""
 #~ msgstr "કામ કરવાની જગ્યાઓ અને હાંસિયાઓ"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "હાંસિયાઓ"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "વિન્ડો વ્યવસ્થાપક"
 
diff --git a/po/he.po b/po/he.po
index 74fd2b9..6b0eb2b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-11-11 21:28+0200\n"
 "Last-Translator: Yuval Tanny <tanai at int.gov.il>\n"
 "Language-Team: Hebrew\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -83,279 +83,278 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "בטל פעולת חלון"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "מנהל חלונות"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "בטל פעולת חלון"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "הגדרות נוספות של מנהל החלונות"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "מספר סביבות עבודה:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "בטל פעולת חלון"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "סביבות עבודה"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "הזזה ושינוי גודל"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "פרישת כפתורים"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-#, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "פעולת לחיצה כפולה"
+msgid "<b>_Theme</b>"
+msgstr "<b>_ערכת נושא</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "אופן ההתמקדות"
+msgid "<b>Title fon_t</b>"
+msgstr "גופן כותרת"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "התמקדות על חלון חדש"
+msgid "<b>Title _alignment</b>"
+msgstr "יישור כותרת"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "הבא לחזית בלחיצה"
+msgid "Click and drag the buttons to change the layout"
+msgstr "לחץ ושחרר לחצן כדי לשנות את הפריסה"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "הבא לחזית בהתמקדות"
+msgid "Title"
+msgstr "כותרת"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "יישור כותרת"
+msgid "The window title cannot be removed"
+msgstr "החלון מסומן, אין אפשרות להסיר אותו"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "גופן כותרת"
+msgid "Active"
+msgstr "פעיל"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "קיצורי דרך לחלונות"
+msgid "Menu"
+msgstr "תפריט"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "הצמדת חלונות"
+msgid "Stick"
+msgstr "הדבק"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "גלישת סביבות עבודה"
+msgid "Shade"
+msgstr "גלול"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_ערכת נושא</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "_הגדל"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "הגדל"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "גדול"
+msgid "Close"
+msgstr "סגור"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "מוסתר"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "שקיפות"
+msgid "<b>Button layout</b>"
+msgstr "פרישת כפתורים"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "סגנון"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "קטן"
+msgid "<b>Window _shortcuts</b>"
+msgstr "קיצורי דרך לחלונות"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "גדול"
+msgid "Ke_yboard"
+msgstr "מקלדת"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "פעיל"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "לחיצה להתמקדות"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "מתקדם"
+msgid "Focus follows _mouse"
+msgstr "התמקדות עוקבת אחר העכבר"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "הבא חלונות לחזית באופן אוטומטי כאשר מתמקדים עליהן"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "התמקד באופן אוטומטי על חלון חדש שנוצר"
+msgid "_Delay before window receives focus:"
+msgstr "השהיה בטרם הבאת חלונות לחזית כאשר מתמקדים עליהן:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "לחיצה להתמקדות"
+msgid "<i>Short</i>"
+msgstr "שקיפות"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "לחץ ושחרר לחצן כדי לשנות את הפריסה"
+msgid "<i>Long</i>"
+msgstr "גדול"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "סגור"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "אופן ההתמקדות"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "השהיה בטרם הבאת חלונות לחזית כאשר מתמקדים עליהן:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "התמקד באופן אוטומטי על חלון חדש שנוצר"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "מרחק:"
+msgid "<b>New window focus</b>"
+msgstr "התמקדות על חלון חדש"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "התמקדות עוקבת אחר העכבר"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "הבא חלונות לחזית באופן אוטומטי כאשר מתמקדים עליהן"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "מוסתר"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "השהיה בטרם הבאת חלונות לחזית כאשר מתמקדים עליהן:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "הצג את תוכן החלון בעת הזזה"
+msgid "<b>Raise on focus</b>"
+msgstr "הבא לחזית בהתמקדות"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "הצג את תוכן החלון בעת שינוי גודל"
+msgid "Raise window when clicking _inside application window"
+msgstr "הבא חלון לחזית כאשר לוחצים בתוך חלון היישום"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "מקלדת"
+msgid "<b>Raise on click</b>"
+msgstr "הבא לחזית בלחיצה"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "הגדל"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "התמקדות"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "תפריט"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "הצמד חלונות לגבולות המרקע"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "_הגדל"
+msgid "Snap windows to other _windows"
+msgstr "הצמד חלונות לחלונות סמוכים"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "הבא חלון לחזית כאשר לוחצים בתוך חלון היישום"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "גלול"
+msgid "Dis_tance:"
+msgstr "מרחק:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "הצמד חלונות לחלונות סמוכים"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "הצמד חלונות לגבולות המרקע"
+msgid "<i>Small</i>"
+msgstr "קטן"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "הדבק"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "גדול"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "פעולה לביצוע בעת לחיצה כפולה בשורת הכותרת"
+msgid "<b>Windows snapping</b>"
+msgstr "הצמדת חלונות"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "החלון מסומן, אין אפשרות להסיר אותו"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "גלוש בין סביבות עבודה כאשר המצביע מגיע לגבול המסך"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "כותרת"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "גלוש בין סביבות עבודה כאשר חלון נגרר אל מחוץ למסך"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "התנגדות למעבר:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "גלישת סביבות עבודה"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "גלוש בין סביבות עבודה כאשר המצביע מגיע לגבול המסך"
+msgid "Hide content of windows when _resizing"
+msgstr "הצג את תוכן החלון בעת שינוי גודל"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "השהיה בטרם הבאת חלונות לחזית כאשר מתמקדים עליהן:"
+msgid "Hide content of windows when _moving"
+msgstr "הצג את תוכן החלון בעת הזזה"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "התנגדות למעבר:"
+msgid "<b>Box move and resize</b>"
+msgstr "הזזה ושינוי גודל"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "התמקדות"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "פעולה לביצוע בעת לחיצה כפולה בשורת הכותרת"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "פעולת לחיצה כפולה"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "סגנון"
+msgid "Ad_vanced"
+msgstr "מתקדם"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -732,54 +731,57 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "גדול"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"דלג על חלונות שהמאפיין \"דלג מחליף סביבות עבודה\"\n"
+"או \"דלג שרות משימות\" בהם מאפשר"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "אטום"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "שתף חלונות ממוזערים"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "שקיפות"
+msgid "Cycle _through windows on all workspaces"
+msgstr "עבור דרך חלונות מכל סביבות העבודה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "מנע גנבת מיקוד חלונות"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "מעבר מחזורי"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "מנע גנבת מיקוד חלונות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Compositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "כבד את סטנדרט סימני מיקוד החלונות ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "מעבר מחזורי"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "עבור דרך חלונות מכל סביבות העבודה"
+msgid "_Bring window on current workspace"
+msgstr "העבר חלון לסביבת העבודה ההבאה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "הצג חלונות במצב מסך מלא ישירות"
+msgid "Switch to win_dow's workspace"
+msgstr "העבר חלון לסביבת עבודה %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -788,183 +790,188 @@ msgstr "כלום"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "הסתר את מסגרת החלון כאשר הוא בגודל מרבי"
+msgid "Key used to _grab and move windows:"
+msgstr "מקש המשמש לתפיסת והזזת חלונות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "כבד את סטנדרט סימני מיקוד החלונות ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "הבא חלון לקדימה עבור כל לחיצת עכבר"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "הסתר את מסגרת החלון כאשר הוא בגודל מרבי"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "מקש המשמש לתפיסת והזזת חלונות"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "החזר את הגודל המקורי של החלון המוגדל כאשר הוא מוזז"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "השתמש בהתנגדות שוליים במקום הצמדת החלונות אליהם"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "אטימות של קישוטי חלונות"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "אטימות של חלונות לא פעילים"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "אטימות של חלונות קופצים"
+msgid "_Accessibility"
+msgstr "נגישות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "אטימות של חלונות בזמן גרירה"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "אטימות של חלונות בזמן שינוי גודל"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "החזר את הגודל המקורי של החלון המוגדל כאשר הוא מוזז"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr "זכור והחזר את סביבת העבודה הקודמת כאשר מחליפים באמצעות קיצורי המקדלת."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "הראה צל מתחת לחלון קופץ"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "גלוש בין סביבות עבודה לפי פריסת השולחנות האמתית"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "הראה צל מתחת לחלון רגיל"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "אפשר גלישה גם בין סביבות העבודה הראשונה והאחרונה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "הראה צל מתחת לחלון קופץ"
+msgid "_Workspaces"
+msgstr "סביבות עבודה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "העבר חלון לסביבת עבודה %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "גודל חלון מינימלי להפעלת התמקמות חכמה"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "השתמש בהתנגדות שוליים במקום הצמדת החלונות אליהם"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "גדול"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "גלוש בין סביבות עבודה לפי פריסת השולחנות האמתית"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "אפשר גלישה גם בין סביבות העבודה הראשונה והאחרונה"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "נגישות"
+msgid "_Placement"
+msgstr "התמקמות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "העבר חלון לסביבת העבודה ההבאה"
+msgid "_Enable display compositing"
+msgstr "אפשר compositing לתצוגה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "הצג חלונות במצב מסך מלא ישירות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "אפשר compositing לתצוגה"
+msgid "Show shadows under _regular windows"
+msgstr "הראה צל מתחת לחלון רגיל"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "הראה צל מתחת לחלון קופץ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "שתף חלונות ממוזערים"
+msgid "Show shadows under _dock windows"
+msgstr "הראה צל מתחת לחלון קופץ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "גודל חלון מינימלי להפעלת התמקמות חכמה"
+msgid "Opaci_ty of window decorations:"
+msgstr "אטימות של קישוטי חלונות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "התמקמות"
+msgid "<i>Transparent</i>"
+msgstr "שקיפות"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "הבא חלון לקדימה עבור כל לחיצת עכבר"
+msgid "<i>Opaque</i>"
+msgstr "אטום"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr "זכור והחזר את סביבת העבודה הקודמת כאשר מחליפים באמצעות קיצורי המקדלת."
+msgid "Opacity of _inactive windows:"
+msgstr "אטימות של חלונות לא פעילים"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "אטימות של חלונות בזמן גרירה"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"דלג על חלונות שהמאפיין \"דלג מחליף סביבות עבודה\"\n"
-"או \"דלג שרות משימות\" בהם מאפשר"
+msgid "Opacity of windows during resi_ze:"
+msgstr "אטימות של חלונות בזמן שינוי גודל"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "אטימות של חלונות קופצים"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "סביבות עבודה"
+msgid "C_ompositor"
+msgstr "Compositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "שוליים"
+msgid "_Number of workspaces:"
+msgstr "מספר סביבות עבודה:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "גלישת סביבות עבודה"
+msgid "Names"
+msgstr "שם:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "שוליים הם האזורים בקצוות המסך בהם לא ימוקמו חלונות"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "מספר סביבות עבודה:"
+msgid "_Margins"
+msgstr "שוליים"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -972,36 +979,36 @@ msgstr "מספר סביבות עבודה:"
 msgid "%s (on %s)"
 msgstr "%s (על %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "הגדרות מנהל חלונות Xfce4"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1145,6 +1152,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "מספר סביבות עבודה:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "שוליים"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "גלישת סביבות עבודה"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "שמות סביבות עבודה"
 
@@ -1311,9 +1330,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "שנה שם"
 
-#~ msgid "Name:"
-#~ msgstr "שם:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "לחץ על שם סביבת העבודה כדי לערוך אותו"
 
@@ -1329,9 +1345,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "סביבות עבודה ושוליים"
 
-#~ msgid "Margins"
-#~ msgstr "שוליים"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "הגדרות מנהל חלונות"
 
diff --git a/po/hi.po b/po/hi.po
index 6519f93..9a91434 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:44+0900\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami at yahoo.com>\n"
 "Language-Team: Hindi <indlinux-group at lists.sourceforge.net>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -77,292 +77,291 @@ msgstr "कार्यस्थान हाशिया "
 msgid "Settings manager socket"
 msgstr ""
 
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
-
 # gnome-session/splash.c:71
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "विन्डो प्रबंधक"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
 # gnome-session/splash.c:71
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "विन्डो प्रबंधक"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "कार्यस्थान व्रेप करें"
+msgid "Fine-tune window behaviour and effects"
+msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 #, fuzzy
 msgid "Workspaces"
 msgstr "कार्यस्थान %i"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "अपारदर्शी हटाएं एवं आकार परिवर्तन करें"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "बटन लेआउट"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "डबल क्लिक करने पर क्रिया"
+msgid "<b>_Theme</b>"
+msgstr "शीर्षक पंक्तिबद्धता"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "फोकस माडल"
+msgid "<b>Title fon_t</b>"
+msgstr "शीर्षक फोंट"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "नया विंडो फोकस "
+msgid "<b>Title _alignment</b>"
+msgstr "शीर्षक पंक्तिबद्धता"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "क्लिक पर उठाएं"
+msgid "Click and drag the buttons to change the layout"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "फोकस पर उठाएं"
+msgid "Title"
+msgstr "शीर्षक"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "शीर्षक पंक्तिबद्धता"
+msgid "The window title cannot be removed"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "शीर्षक फोंट"
+msgid "Active"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "नया विंडो फोकस "
+msgid "Menu"
+msgstr "मेन्यू"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "विंडोस स्नेपिंग"
+msgid "Stick"
+msgstr "स्टिक"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "कार्यस्थान व्रेप करें"
+msgid "Shade"
+msgstr "छाया"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "शीर्षक पंक्तिबद्धता"
+msgid "Minimize"
+msgstr "बडा करें (_x)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "अधिकतम"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "बंद करें"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "हिडन"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "बटन लेआउट"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "शीर्षक"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "छोटा"
+msgid "<b>Window _shortcuts</b>"
+msgstr "नया विंडो फोकस "
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "दूरी :"
+msgid "Ke_yboard"
+msgstr "कीबोर्ड शार्टकट"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr ""
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "फोकस देने हेतु क्लिक करें"
 
-# #-#-#-#-#  gnome-control-center.gnome-2-4.hi.po (control center)  #-#-#-#-#
-# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop 4.3.90.1)  #-#-#-#-#
-# libgnome-desktop/gnome-ditem-edit.c:776
-# #-#-#-#-#  gnome-desktop.HEAD.hi.po (gnome-desktop-2.0.hi)  #-#-#-#-#
-# libgnome-desktop/gnome-ditem-edit.c:776
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "उन्नत"
+msgid "Focus follows _mouse"
+msgstr "फोकस माउस के पीछे"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"जब विंडो में फोकस प्राप्त हो \n"
-"तो विंडो स्वतः उठाएं"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr ""
-"नए बने हुए विंडो में  \n"
-"स्वतः फोकस दें"
+msgid "_Delay before window receives focus:"
+msgstr "फोकस किए विंडो को ऊपर लाने से पहले विलम्ब"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "फोकस देने हेतु क्लिक करें"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "बंद करें"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "फोकस माडल"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "फोकस किए विंडो को ऊपर लाने से पहले विलम्ब"
+msgid "Automatically give focus to _newly created windows"
+msgstr ""
+"नए बने हुए विंडो में  \n"
+"स्वतः फोकस दें"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "दूरी :"
+msgid "<b>New window focus</b>"
+msgstr "नया विंडो फोकस "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "फोकस माउस के पीछे"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"जब विंडो में फोकस प्राप्त हो \n"
+"तो विंडो स्वतः उठाएं"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "हिडन"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "फोकस किए विंडो को ऊपर लाने से पहले विलम्ब"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+msgid "<b>Raise on focus</b>"
+msgstr "फोकस पर उठाएं"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
+msgid "Raise window when clicking _inside application window"
+msgstr ""
+"जब भीतर क्लिक करें तो विंडो उठाएं\n"
+"अनुप्रयोग विंडो"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "कीबोर्ड शार्टकट"
+msgid "<b>Raise on click</b>"
+msgstr "क्लिक पर उठाएं"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "अधिकतम"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "फोकस माडल"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "मेन्यू"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "विंडोस को स्क्रीन बार्डर में स्नेप करें"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "बडा करें (_x)"
+msgid "Snap windows to other _windows"
+msgstr "विंडोस को अन्य विंडोस में स्नेप करें"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-"जब भीतर क्लिक करें तो विंडो उठाएं\n"
-"अनुप्रयोग विंडो"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "छाया"
+msgid "Dis_tance:"
+msgstr "दूरी :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "विंडोस को अन्य विंडोस में स्नेप करें"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "विंडोस को स्क्रीन बार्डर में स्नेप करें"
+msgid "<i>Small</i>"
+msgstr "छोटा"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "स्टिक"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "दूरी :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "टाइटल बार में डबल क्लिक करने पर क्रिया निष्पादन :"
+msgid "<b>Windows snapping</b>"
+msgstr "विंडोस स्नेपिंग"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "शीर्षक"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "जब स्क्रीन के बाहर विंडो को खींचें तो कार्यस्थानों को व्रेप करें"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "किनारा प्रतिरोध :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "कार्यस्थान व्रेप करें"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें"
+msgid "Hide content of windows when _resizing"
+msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "फोकस किए विंडो को ऊपर लाने से पहले विलम्ब"
+msgid "Hide content of windows when _moving"
+msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "किनारा प्रतिरोध :"
+msgid "<b>Box move and resize</b>"
+msgstr "अपारदर्शी हटाएं एवं आकार परिवर्तन करें"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "फोकस माडल"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "टाइटल बार में डबल क्लिक करने पर क्रिया निष्पादन :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "डबल क्लिक करने पर क्रिया"
 
+# #-#-#-#-#  gnome-control-center.gnome-2-4.hi.po (control center)  #-#-#-#-#
+# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop 4.3.90.1)  #-#-#-#-#
+# libgnome-desktop/gnome-ditem-edit.c:776
+# #-#-#-#-#  gnome-desktop.HEAD.hi.po (gnome-desktop-2.0.hi)  #-#-#-#-#
+# libgnome-desktop/gnome-ditem-edit.c:776
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "शीर्षक"
+msgid "Ad_vanced"
+msgstr "उन्नत"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -758,48 +757,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "नया विंडो फोकस "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "कीबोर्ड शार्टकट"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "नया विंडो फोकस "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "नया विंडो फोकस "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -807,166 +808,171 @@ msgid "Do _nothing"
 msgstr "कुछ नहीं"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "नया विंडो फोकस "
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "कार्यस्थान %i"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "नया विंडो फोकस "
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "आकार बदलने पर विंडो की चीजों को दिखाएं"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
 #, fuzzy
-msgid "_Workspaces"
-msgstr "कार्यस्थान %i"
+msgid "Opacity of popup window_s:"
+msgstr "खिसकाने पर विंडो की चीजों को दिखाएं"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "फोकस पर उठाएं"
+msgid "C_ompositor"
+msgstr "कीबोर्ड शार्टकट"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Workspaces</b>"
+msgid "_Number of workspaces:"
 msgstr "कार्यस्थान व्रेप करें"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "हाशिए, स्क्रीन के किनारे के क्षेत्र हैं जहां कोई विंडो रखा नहीं जा सकता"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "कार्यस्थान व्रेप करें"
+msgid "_Margins"
+msgstr "फोकस पर उठाएं"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -974,37 +980,37 @@ msgstr "कार्यस्थान व्रेप करें"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
 # gnome-session/splash.c:71
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "विन्डो प्रबंधक"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1144,6 +1150,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "कार्यस्थान व्रेप करें"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "फोकस पर उठाएं"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "कार्यस्थान व्रेप करें"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "कार्यस्थान हाशिया "
 
@@ -1270,10 +1288,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "कार्यस्थान हाशिया "
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "फोकस पर उठाएं"
-
 # gnome-session/splash.c:71
 #, fuzzy
 #~ msgid "Window Manager Settings"
diff --git a/po/hr.po b/po/hr.po
index 03d9d1b..a86fea4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-02 21:30+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-06-12 00:06+0200\n"
 "Last-Translator: Ivica Kolić<ikoli at yahoo.com> <>\n"
 "Language-Team: Croatian <>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -82,237 +83,237 @@ msgid "Settings manager socket"
 msgstr "Socket upravitelja postavkama"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Postavi ponašanje prozora i prečica"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Upravitelj prozora"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Detaljno postavljanje ponašanja prozora i efekata"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Postavi ponašanje prozora i prečica"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Postavke Upravitelja Prozora"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Postavi broj i imena radnih prostora"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Detaljno postavljanje ponašanja prozora i efekata"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Radni prostori"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Micanje i promjena veličine okvira</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Način prikaza gumbića</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dvoklik _radnja</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Način fokusa</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Fon_t Natpisa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokusiranje novih prozora</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Centriranje natpisa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Podigni na klik</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klikni i vuci gumbiće za izmjenu rasporeda izgleda"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Podigni na fokus</b>"
+msgid "Title"
+msgstr "Naslov"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Centriranje natpisa</b>"
+msgid "The window title cannot be removed"
+msgstr "Natpis prozora ne može biti maknut"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Fon_t Natpisa</b>"
+msgid "Active"
+msgstr "Aktivan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Kratice pro_zora</b>"
+msgid "Menu"
+msgstr "Izbornik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Ljepljenje prozora</b>"
+msgid "Stick"
+msgstr "Priljepi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Radne površine u krug</b>"
+msgid "Shade"
+msgstr "Sjena"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimiziraj"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimiziraj"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Dugo</i>"
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Skriveno"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kratko</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Način prikaza gumbića</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Malo</i>"
+msgid "_Reset to Defaults"
+msgstr "_Postavi na uobičajene vrijednosti"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Kratice pro_zora</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Širina</i>"
+msgid "Ke_yboard"
+msgstr "Ti_pkovnica"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktivan"
+msgid "Clic_k to focus"
+msgstr "Kli_kni za fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Na_predno"
+msgid "Focus follows _mouse"
+msgstr "Fokus slijedi _miša"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automatski podigni p_rozor čim dobi fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automatski daj fokus _novim prozorima"
+msgid "_Delay before window receives focus:"
+msgstr "Stanka prije nego prozor _primi  fokus"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kli_kni za fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klikni i vuci gumbiće za izmjenu rasporeda izgleda"
+msgid "<i>Short</i>"
+msgstr "<i>Kratko</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Zatvori"
+msgid "<i>Long</i>"
+msgstr "<i>Dugo</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Način fokusa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Stanka _prije podizanja prozora"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automatski daj fokus _novim prozorima"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Uda_ljenost"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokusiranje novih prozora</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus slijedi _miša"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automatski podigni p_rozor čim dobi fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Skriveno"
+msgid "Delay _before raising focused window:"
+msgstr "Stanka _prije podizanja prozora"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Sakrij sadržaj prozora prilikom pre_mještanja"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Podigni na fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Sakrij sadržaj prozora prilikom p_romjene veličine"
+msgid "Raise window when clicking _inside application window"
+msgstr "Podigni prozor prilikom k_lika na unutarnji prozor"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Ti_pkovnica"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Podigni na klik</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimiziraj"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Izbornik"
+msgid "Snap windows to screen _border"
+msgstr "Priljepi prozore za granice _zaslona"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimiziraj"
+msgid "Snap windows to other _windows"
+msgstr "Priljepi prozore sa ostale _prozore"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Podigni prozor prilikom k_lika na unutarnji prozor"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Sjena"
+msgid "Dis_tance:"
+msgstr "Uda_ljenost"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Priljepi prozore sa ostale _prozore"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Priljepi prozore za granice _zaslona"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Malo</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Priljepi"
+msgid "<i>Wide</i>"
+msgstr "<i>Širina</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Radnja koja se odvija kad se napravi dvoklik na traku sa natpisom"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Ljepljenje prozora</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Natpis prozora ne može biti maknut"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Naslov"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "O_tpornost ruba"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Radne površine u krug</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
+msgid "Hide content of windows when _resizing"
+msgstr "Sakrij sadržaj prozora prilikom p_romjene veličine"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Stanka prije nego prozor _primi  fokus"
+msgid "Hide content of windows when _moving"
+msgstr "Sakrij sadržaj prozora prilikom pre_mještanja"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "O_tpornost ruba"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Micanje i promjena veličine okvira</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Radnja koja se odvija kad se napravi dvoklik na traku sa natpisom"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Postavi na uobičajene vrijednosti"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dvoklik _radnja</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "Na_predno"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -650,45 +651,46 @@ msgstr ""
 "Ovo će vratiti sve prečace na njihovu zadanu vrijednost.Želite li doista to "
 "učiniti?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Veliki</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Neproziran</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Uključi skrivene (tj. iconified) prozore"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Proziran</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "U _centru zaslona"
+msgid "C_ycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Po zadanom,smjesti prozore:"
+msgid "Activate _focus stealing prevention"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr ""
+msgid "_Bring window on current workspace"
+msgstr "_Dovedi prozor na trenutni radni prostor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
+msgid "Switch to win_dow's workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
@@ -696,156 +698,165 @@ msgid "Do _nothing"
 msgstr "Ne _radi ništa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Sakrij _okvir prozora kada je maksimiziran"
+msgid "Key used to _grab and move windows:"
+msgstr "Tipka za _uzimanje i premještanje prozora"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+msgid "Hide _frame of windows when maximized"
+msgstr "Sakrij _okvir prozora kada je maksimiziran"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tipka za _uzimanje i premještanje prozora"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Neprozirno_st dekoracije prozora:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Neprozirnost _neaktivnih prozora:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr ""
+msgid "_Accessibility"
+msgstr "_Pristupačnost"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Neprozirnost prozora tijekom _pomicanja"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Koristi _kotačić miša na radnoj površini za prebacivanje radnih prostora"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Neprozirnost prozora tijekom promije_ne veličine"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "POkaži sjenu ispod _običnih prozora"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
+msgid "_Workspaces"
+msgstr "_Radni prostori"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Ispod pokazivača _miša"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
-"Koristi _kotačić miša na radnoj površini za prebacivanje radnih prostora"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "<i>Veliki</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Po zadanom,smjesti prozore:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
+msgid "At the _center of the screen"
+msgstr "U _centru zaslona"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
+msgid "Under the mouse _pointer"
+msgstr "Ispod pokazivača _miša"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Pristupačnost"
+msgid "_Placement"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Dovedi prozor na trenutni radni prostor"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr "POkaži sjenu ispod _običnih prozora"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Uključi skrivene (tj. iconified) prozore"
+msgid "Show shadows under _dock windows"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+msgid "Opaci_ty of window decorations:"
+msgstr "Neprozirno_st dekoracije prozora:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr ""
+msgid "<i>Transparent</i>"
+msgstr "<i>Proziran</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr ""
+msgid "<i>Opaque</i>"
+msgstr "<i>Neproziran</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+msgid "Opacity of _inactive windows:"
+msgstr "Neprozirnost _neaktivnih prozora:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Neprozirnost prozora tijekom _pomicanja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Neprozirnost prozora tijekom promije_ne veličine"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Radni prostori"
+msgid "C_ompositor"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margine</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Broj radnih prostora:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Radni prostori</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Ime:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margine su prostori na rubovima zaslona gdje nijedan prozor neće biti "
 "smješten"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Broj radnih prostora:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margine</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1013,11 +1024,14 @@ msgstr ""
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Postavi broj i imena radnih prostora"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Radni prostori</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Promjeni ime radnog prostora "
 
-#~ msgid "_Name:"
-#~ msgstr "_Ime:"
-
 #~ msgid "Hide"
 #~ msgstr "Sakrij"
diff --git a/po/hu.po b/po/hu.po
index 39388e5..27eec7b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-07-25 12:16+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -86,237 +86,237 @@ msgid "Settings manager socket"
 msgstr "Beállításkezelő foglalat"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Ablakviselkedés és gyorsbillentyűk beállítása"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Ablakkezelő"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ablakviselkedés és -effektusok finomhangolása"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Ablakviselkedés és gyorsbillentyűk beállítása"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ablakkezelő hangolása"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Munkaterületek számának és neveinek beállítása"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ablakviselkedés és -effektusok finomhangolása"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Munkaterületek"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Doboz mozgatása és átméretezése</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Gombelrendezés</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Dupla kattintás művelete</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Téma</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fókuszmodell</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Cí_m betűkészlete</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Új ablak fókusza</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Cím igazítása</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Előtérbe hozás kattintásra</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Kattintson és húzza a gombokat az elrendezés módosításához"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Előtérbe hozás fókuszra</b>"
+msgid "Title"
+msgstr "Cím"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Cím igazítása</b>"
+msgid "The window title cannot be removed"
+msgstr "Az ablak címe nem távolítható el"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Cí_m betűkészlete</b>"
+msgid "Active"
+msgstr "Aktív"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Abla_k-gyorsbillentyűk</b>"
+msgid "Menu"
+msgstr "Menü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Ablakok illesztése</b>"
+msgid "Stick"
+msgstr "Mindig látható"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Munkaterületek közti váltás</b>"
+msgid "Shade"
+msgstr "Felgördítés"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Téma</b>"
+msgid "Minimize"
+msgstr "Minimalizálás"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximalizálás"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Hosszú</i>"
+msgid "Close"
+msgstr "Bezárás"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Rejtett"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Rövid</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Gombelrendezés</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "Stíl_us"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Kicsi</i>"
+msgid "_Reset to Defaults"
+msgstr "_Alapértelmezések visszaállítása"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Abla_k-gyorsbillentyűk</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Széles</i>"
+msgid "Ke_yboard"
+msgstr "Bille_ntyűzet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktív"
+msgid "Clic_k to focus"
+msgstr "A fókusz a _kattintást követi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Spe_ciális"
+msgid "Focus follows _mouse"
+msgstr "A fókusz az _egeret követi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Ablakok automatikus előtérbe hozása amikor fókuszt kapnak"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Az új_onnan létrehozott ablakok automatikusan megkapják a fókuszt"
+msgid "_Delay before window receives focus:"
+msgstr "Késleltetés, _mielőtt az ablak fókuszt kap:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "A fókusz a _kattintást követi"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Kattintson és húzza a gombokat az elrendezés módosításához"
+msgid "<i>Short</i>"
+msgstr "<i>Rövid</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Bezárás"
+msgid "<i>Long</i>"
+msgstr "<i>Hosszú</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fókuszmodell</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Késleltetés a fókuszba került ablak előtérbe _hozásáig:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Az új_onnan létrehozott ablakok automatikusan megkapják a fókuszt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Táv_olság:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Új ablak fókusza</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "A fókusz az _egeret követi"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Ablakok automatikus előtérbe hozása amikor fókuszt kapnak"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Rejtett"
+msgid "Delay _before raising focused window:"
+msgstr "Késleltetés a fókuszba került ablak előtérbe _hozásáig:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ablak tartalmának elrejtése mo_zgatáskor"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Előtérbe hozás fókuszra</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ablak tartalmának elrejtése át_méretezéskor"
+msgid "Raise window when clicking _inside application window"
+msgstr "Ablak előtérbe ho_zása az alkalmazásablakba kattintáskor"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Bille_ntyűzet"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Előtérbe hozás kattintásra</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximalizálás"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fókusz"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menü"
+msgid "Snap windows to screen _border"
+msgstr "Ablakok _képernyőszegélyhez illesztése"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimalizálás"
+msgid "Snap windows to other _windows"
+msgstr "Ablakok más ablakokhoz _illesztése"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Ablak előtérbe ho_zása az alkalmazásablakba kattintáskor"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Felgördítés"
+msgid "Dis_tance:"
+msgstr "Táv_olság:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Ablakok más ablakokhoz _illesztése"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Ablakok _képernyőszegélyhez illesztése"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Kicsi</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Mindig látható"
+msgid "<i>Wide</i>"
+msgstr "<i>Széles</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "A címsorra való dupla kattintáskor végrehajtandó művelet"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Ablakok illesztése</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Az ablak címe nem távolítható el"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Váltás munk_aterületek közt, ha a mutató eléri a képernyő szélét"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Cím"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "_Váltás munkaterületek közt ablak lehúzásakor a képernyőről"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Szélek _ellenállása:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Munkaterületek közti váltás</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Váltás munk_aterületek közt, ha a mutató eléri a képernyő szélét"
+msgid "Hide content of windows when _resizing"
+msgstr "Ablak tartalmának elrejtése át_méretezéskor"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Késleltetés, _mielőtt az ablak fókuszt kap:"
+msgid "Hide content of windows when _moving"
+msgstr "Ablak tartalmának elrejtése mo_zgatáskor"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Szélek _ellenállása:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Doboz mozgatása és átméretezése</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fókusz"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "A címsorra való dupla kattintáskor végrehajtandó művelet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Alapértelmezések visszaállítása"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Dupla kattintás művelete</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "Stíl_us"
+msgid "Ad_vanced"
+msgstr "Spe_ciális"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -658,205 +658,215 @@ msgstr ""
 "Ez minden gyorsbillentyűt visszaállít az alapértelmezett értékére. Valóban "
 "ezt szeretné?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Nagy</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Átlátszatlan</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"A lapozó kihagyása vagy tál_ca kihagyása\n"
+"tulajdonsággal rendelkező ablakok kihagyása"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Rejtett (ikonméretű) ablakok felvétele"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Átlátszó</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Min_den munkaterület ablakainak végigjárása"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Fókuszlo_pás megelőzésének bekapcsolása"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "Keret raj_zolása kijelölt ablakok köré körbejáráskor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "A képernyő kö_zepére"
+msgid "C_ycling"
+msgstr "_Körbejárás"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Az ablakok alapértelmezett elhelyezése:"
+msgid "Activate _focus stealing prevention"
+msgstr "Fókuszlo_pás megelőzésének bekapcsolása"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_ompozitálás"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "S_zabványos ICCCM fókusztipp figyelembe vétele"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Körbejárás"
+msgid "When a window raises itself:"
+msgstr "Amikor egy ablak előtérbe hozza magát:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Min_den munkaterület ablakainak végigjárása"
+msgid "_Bring window on current workspace"
+msgstr "Ablak ak_tuális munkaterületre hozása"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "_Teljes képernyős átlapolt ablakok közvetlen megjelenítése"
+msgid "Switch to win_dow's workspace"
+msgstr "_Váltás az ablak munkaterületére"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Ne tegyen semmit"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ablakok keretének elrejtése ma_ximalizáláskor"
+msgid "Key used to _grab and move windows:"
+msgstr "Ablakok meg_ragadására és mozgatására használt billentyű:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "S_zabványos ICCCM fókusztipp figyelembe vétele"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Ablakok előtérbe hozása bármely egérgomb le_nyomására"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "A sürgős ablakok _villogjanak folyamatosan"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ablakok keretének elrejtése ma_ximalizáláskor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Ablakok meg_ragadására és mozgatására használt billentyű:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Maximalizált ablakok eredeti méretének visszaállítása _mozgatáskor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "A sürgősségről az ablak_dekoráció villogtatásával értesítsen"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "S_zélek ellenállásának használata az ablakok illesztése helyett"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Ablakdekorá_ciók átlátszatlansága:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "A sürgősségről az ablak_dekoráció villogtatásával értesítsen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "_Inaktív ablakok átlátszatlansága:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "A sürgős ablakok _villogjanak folyamatosan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Felu_gró ablakok átlátszatlansága:"
+msgid "_Accessibility"
+msgstr "_Akadálymentesítés"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Ablakok átlátszatlansága _mozgatáskor:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Egérgörgő _használata az asztalon munkaterületek váltására"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Ablakok átlátszatlansága átmé_retezéskor:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Maximalizált ablakok eredeti méretének visszaállítása _mozgatáskor"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Előző _munkaterület megjegyzése és\n"
+"visszahívása gyorsbillentyűkkel való váltáskor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Árnyékok megjelenítése _dokkolt ablakok alatt"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Váltás munkaterületek kö_zt az aktuális asztalelrendezéstől függően"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Árnyékok megjelenítése _normál ablakok alatt"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"_Váltás munkaterületek közt az első vagy utolsó munkaterület elérésekor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Árn_yékok megjelenítése felugró ablakok alatt"
+msgid "_Workspaces"
+msgstr "M_unkaterületek"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "_Váltás az ablak munkaterületére"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Az egér_mutató alatt"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "S_zélek ellenállásának használata az ablakok illesztése helyett"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Egérgörgő _használata az asztalon munkaterületek váltására"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Intelligens elhelyezést aktiváló ablakok minimális mérete:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Amikor egy ablak előtérbe hozza magát:"
+msgid "<i>Large</i>"
+msgstr "<i>Nagy</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Az ablakok alapértelmezett elhelyezése:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Váltás munkaterületek kö_zt az aktuális asztalelrendezéstől függően"
+msgid "At the _center of the screen"
+msgstr "A képernyő kö_zepére"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"_Váltás munkaterületek közt az első vagy utolsó munkaterület elérésekor"
+msgid "Under the mouse _pointer"
+msgstr "Az egér_mutató alatt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Akadálymentesítés"
+msgid "_Placement"
+msgstr "_Elhelyezés"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Ablak ak_tuális munkaterületre hozása"
+msgid "_Enable display compositing"
+msgstr "Kijel_ző kompozitálásának engedélyezése"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "Keret raj_zolása kijelölt ablakok köré körbejáráskor"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "_Teljes képernyős átlapolt ablakok közvetlen megjelenítése"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Kijel_ző kompozitálásának engedélyezése"
+msgid "Show shadows under _regular windows"
+msgstr "Árnyékok megjelenítése _normál ablakok alatt"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Árn_yékok megjelenítése felugró ablakok alatt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Rejtett (ikonméretű) ablakok felvétele"
+msgid "Show shadows under _dock windows"
+msgstr "Árnyékok megjelenítése _dokkolt ablakok alatt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Intelligens elhelyezést aktiváló ablakok minimális mérete:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Ablakdekorá_ciók átlátszatlansága:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Elhelyezés"
+msgid "<i>Transparent</i>"
+msgstr "<i>Átlátszó</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Ablakok előtérbe hozása bármely egérgomb le_nyomására"
+msgid "<i>Opaque</i>"
+msgstr "<i>Átlátszatlan</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Előző _munkaterület megjegyzése és\n"
-"visszahívása gyorsbillentyűkkel való váltáskor"
+msgid "Opacity of _inactive windows:"
+msgstr "_Inaktív ablakok átlátszatlansága:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Ablakok átlátszatlansága _mozgatáskor:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"A lapozó kihagyása vagy tál_ca kihagyása\n"
-"tulajdonsággal rendelkező ablakok kihagyása"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Ablakok átlátszatlansága átmé_retezéskor:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Felu_gró ablakok átlátszatlansága:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "M_unkaterületek"
+msgid "C_ompositor"
+msgstr "K_ompozitálás"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margók</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Mu_nkaterületek száma:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Munkaterületek</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Név:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "A margók a képernyő szélén lévő területek, ahol nem jelennek meg ablakok"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Mu_nkaterületek száma:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margók</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -864,35 +874,35 @@ msgstr "Mu_nkaterületek száma:"
 msgid "%s (on %s)"
 msgstr "%s (ezen: %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Indítás a háttérbe"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Indítás a háttérbe (nem támogatott)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Kompozitáló mód beállítása"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Kompozitáló mód beállítása (nem támogatott)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Meglévő ablakkezelő cseréje"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Verzióinformációk kiírása és kilépés"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTUMOK]…"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Segítségért adja ki a „%s --help” parancsot."
@@ -1026,12 +1036,15 @@ msgstr "Hiba az adatok olvasásakor a gyermekfolyamattól: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nem indítható a segédablak: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Munkaterületek számának és neveinek beállítása"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Munkaterületek</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Munkaterület nevének módosítása"
 
-#~ msgid "_Name:"
-#~ msgstr "_Név:"
-
 #~ msgid "Hide"
 #~ msgstr "Elrejtés"
 
diff --git a/po/id.po b/po/id.po
index 3d2865c..7959667 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
 # Andhika Padmawan <andhika.padmawan at gmail.com>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-18 01:18+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2008-12-21 21:53+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -82,237 +82,237 @@ msgid "Settings manager socket"
 msgstr "Pengaturan soket manajer"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Atur perilaku jendela dan jalan pintas"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Manajer Jendela"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Atur perilaku jendela dah efek"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Atur perilaku jendela dan jalan pintas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Tweak Manajer Jendela"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Atur jumlah dan nama ruang kerja"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Atur perilaku jendela dah efek"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Ruang Kerja"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Pindah kotak dan ubah ukuran</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Tata letak tombol</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Aksi klik _ganda</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Model fokus</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Fonta judu_l</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus jendela baru</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Perataan _judul</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Naikkan pada klik</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klik dan tarik tombol untuk mengubah tata letak"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Naikkan pada fokus</b>"
+msgid "Title"
+msgstr "Judul"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Perataan _judul</b>"
+msgid "The window title cannot be removed"
+msgstr "Judul jendela tak dapat dihapus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Fonta judu_l</b>"
+msgid "Active"
+msgstr "Aktif"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Jalan _pintas jendela</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Magnetisasi jendela</b>"
+msgid "Stick"
+msgstr "Lekat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Gulung ruang kerja</b>"
+msgid "Shade"
+msgstr "Bayang"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimalkan"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimalkan"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Panjang</i>"
+msgid "Close"
+msgstr "Tutup"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Tersembunyi"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Pendek</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Tata letak tombol</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Gaya"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Kecil</i>"
+msgid "_Reset to Defaults"
+msgstr "K_embalikan ke Standar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Jalan _pintas jendela</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Lebar</i>"
+msgid "Ke_yboard"
+msgstr "Pa_pan ketik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktif"
+msgid "Clic_k to focus"
+msgstr "Kli_k untuk fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Ma_hir"
+msgid "Focus follows _mouse"
+msgstr "Fokus mengikuti _tetikus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Otomatis _menaikkan jendela ketika jendela menerima fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Otomatis memfokuskan pada jendela yang _baru dibuat"
+msgid "_Delay before window receives focus:"
+msgstr "_Tunda sebelum jendela menerima fokus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kli_k untuk fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klik dan tarik tombol untuk mengubah tata letak"
+msgid "<i>Short</i>"
+msgstr "<i>Pendek</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Tutup"
+msgid "<i>Long</i>"
+msgstr "<i>Panjang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Model fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Tunda _sebelum menaikkan jendela yang difokuskan:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Otomatis memfokuskan pada jendela yang _baru dibuat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Ja_rak:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus jendela baru</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus mengikuti _tetikus"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Otomatis _menaikkan jendela ketika jendela menerima fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Tersembunyi"
+msgid "Delay _before raising focused window:"
+msgstr "Tunda _sebelum menaikkan jendela yang difokuskan:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Tampilkan isi jendela ketika _memindahkan"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Naikkan pada fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Tampilkan isi jendela ketika mengubah _ukuran"
+msgid "Raise window when clicking _inside application window"
+msgstr "Naikkan jendela ketika klik _di dalam jendela aplikasi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Pa_pan ketik"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Naikkan pada klik</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimalkan"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Lekatkan jendela ke _batas layar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimalkan"
+msgid "Snap windows to other _windows"
+msgstr "Lekatkan jendela ke _jendela lain"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Naikkan jendela ketika klik _di dalam jendela aplikasi"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Bayang"
+msgid "Dis_tance:"
+msgstr "Ja_rak:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Lekatkan jendela ke _jendela lain"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Lekatkan jendela ke _batas layar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Kecil</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Lekat"
+msgid "<i>Wide</i>"
+msgstr "<i>Lebar</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Aksi yang dilakukan ketika batang judul diklik-ganda"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Magnetisasi jendela</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Judul jendela tak dapat dihapus"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Gulung ruang kerja ketika _penunjuk mencapai tepi layar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Judul"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Gulung ruang kerja _ketika menarik jendela keluar layar"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Ketahanan tepi:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Gulung ruang kerja</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Gulung ruang kerja ketika _penunjuk mencapai tepi layar"
+msgid "Hide content of windows when _resizing"
+msgstr "Tampilkan isi jendela ketika mengubah _ukuran"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Tunda sebelum jendela menerima fokus:"
+msgid "Hide content of windows when _moving"
+msgstr "Tampilkan isi jendela ketika _memindahkan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Ketahanan tepi:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Pindah kotak dan ubah ukuran</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Aksi yang dilakukan ketika batang judul diklik-ganda"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "K_embalikan ke Standar"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Aksi klik _ganda</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Gaya"
+msgid "Ad_vanced"
+msgstr "Ma_hir"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -650,206 +650,216 @@ msgstr ""
 "Ini akan mengatur ulang semua jalan pintas ke nilai standar mereka. Anda "
 "yakin ingin melakukan ini?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Besar</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opasitas</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Lewati jendela yang punya pengaturan properti\n"
+"\"skip pager\" atau \"skip taskbar\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Termasuk jendela (misalnya dalam bentuk ikon) tersembunyi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparan</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Daur _seluruh jendela dari semua ruang kerja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktifkan _pencegahan pencurian fokus"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Gambar bingkai di sekeliling jendela terpilih ketika mendaur"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Di _tengah layar"
+msgid "C_ycling"
+msgstr "D_aur"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Secara standar, tempatkan jendela:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktifkan _pencegahan pencurian fokus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_ompositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Hormati _standar petujuk fokus ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "D_aur"
+msgid "When a window raises itself:"
+msgstr "Ketika jendela menaikkan dirinya sendiri:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Daur _seluruh jendela dari semua ruang kerja"
+msgid "_Bring window on current workspace"
+msgstr "_Bawa jendela ke ruang kerja saat ini"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Tampilkan _langsung jendela lapisan layar penuh"
+msgid "Switch to win_dow's workspace"
+msgstr "Pindah ke jende_la ruang kerja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Tak lakukan _apa-apa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Sembunyikan _bingkai jendela ketika dimaksimalkan"
+msgid "Key used to _grab and move windows:"
+msgstr "Tombol yang digunakan untuk _menangkap dan memindahkan jendela:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Hormati _standar petujuk fokus ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Naikkan jendela ketika ada tombol tetikus yang ditekan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Biarkan jendela mendesak _berkedip berulang kali"
+msgid "Hide _frame of windows when maximized"
+msgstr "Sembunyikan _bingkai jendela ketika dimaksimalkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tombol yang digunakan untuk _menangkap dan memindahkan jendela:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Kembalikan ukuran asli _dari jendela yang dimaksimalkan ketika memindahkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Gunakan ketahanan _tepi ketimbang mangetitasi jendela"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
 msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 "Pemberitahuan _keadaan mendesak dengan membuat dekorasi jendela berkedip"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opasi_tas dekorasi jendela:"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opasitas _jendela tidak aktif:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Biarkan jendela mendesak _berkedip berulang kali"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opasitas jendela yang munc_ul:"
+msgid "_Accessibility"
+msgstr "_Aksesibilitas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opasitas jendela ketika _pindah:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Gunakan _roda tetikus pada desktop untuk berpindah ruang kerja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opasitas jendela ketika ubah uku_ran:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Kembalikan ukuran asli _dari jendela yang dimaksimalkan ketika memindahkan"
+"_Ingat dan panggil ulang ruang kerja sebelumnya\n"
+"ketika pindah via jalan pintas papan ketik"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Tampilkan bayangan di bawah _dok jendela"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Gulung ruang kerja berdasarkan tata _letak destop sebenarnya"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Tampilkan bayangan di bawah jendela _reguler"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Gulung ruang kerja jika ruang kerja _pertama atau terakhir tercapai"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Tampilkan bayangan di bawah jendela yang mun_cul"
+msgid "_Workspaces"
+msgstr "_Ruang Kerja"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Pindah ke jende_la ruang kerja"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Di bawah _penunjuk tetikus"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Gunakan ketahanan _tepi ketimbang mangetitasi jendela"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Gunakan _roda tetikus pada desktop untuk berpindah ruang kerja"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Ukuran minimum jendela untuk menyulut penempatan cerdas:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Ketika jendela menaikkan dirinya sendiri:"
+msgid "<i>Large</i>"
+msgstr "<i>Besar</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Secara standar, tempatkan jendela:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Gulung ruang kerja berdasarkan tata _letak destop sebenarnya"
+msgid "At the _center of the screen"
+msgstr "Di _tengah layar"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Gulung ruang kerja jika ruang kerja _pertama atau terakhir tercapai"
+msgid "Under the mouse _pointer"
+msgstr "Di bawah _penunjuk tetikus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Aksesibilitas"
+msgid "_Placement"
+msgstr "_Penempatan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Bawa jendela ke ruang kerja saat ini"
+msgid "_Enable display compositing"
+msgstr "Akti_fkan komposisi tampilan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Gambar bingkai di sekeliling jendela terpilih ketika mendaur"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Tampilkan _langsung jendela lapisan layar penuh"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Akti_fkan komposisi tampilan"
+msgid "Show shadows under _regular windows"
+msgstr "Tampilkan bayangan di bawah jendela _reguler"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Tampilkan bayangan di bawah jendela yang mun_cul"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Termasuk jendela (misalnya dalam bentuk ikon) tersembunyi"
+msgid "Show shadows under _dock windows"
+msgstr "Tampilkan bayangan di bawah _dok jendela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Ukuran minimum jendela untuk menyulut penempatan cerdas:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opasi_tas dekorasi jendela:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Penempatan"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparan</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Naikkan jendela ketika ada tombol tetikus yang ditekan"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opasitas</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Ingat dan panggil ulang ruang kerja sebelumnya\n"
-"ketika pindah via jalan pintas papan ketik"
+msgid "Opacity of _inactive windows:"
+msgstr "Opasitas _jendela tidak aktif:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opasitas jendela ketika _pindah:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Lewati jendela yang punya pengaturan properti\n"
-"\"skip pager\" atau \"skip taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opasitas jendela ketika ubah uku_ran:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opasitas jendela yang munc_ul:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Ruang Kerja"
+msgid "C_ompositor"
+msgstr "K_ompositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margin</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Jumlah ruang kerja:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Ruang kerja</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nama:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margin adalah area di pinggir layar dimana tak ada jendela akan ditempatkan"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Jumlah ruang kerja:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Margin"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -857,35 +867,35 @@ msgstr "_Jumlah ruang kerja:"
 msgid "%s (on %s)"
 msgstr "%s (di %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Jalankan di latar belakang"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Jalankan di latar belakang (tidak didukung)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Atur mode kompositor"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Atur mode kompositor (tidak didukung)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Ganti manajer jendela yang ada"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi lalu keluar"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMEN...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Ketik \"%s --help\" untuk penggunaan."
@@ -1017,6 +1027,15 @@ msgstr "Galat membaca data dari proses anak: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Tak dapat pijah helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Atur jumlah dan nama ruang kerja"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Margin</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Ruang kerja</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Ubah nama ruang kerja"
 
@@ -1209,9 +1228,6 @@ msgstr "Tak dapat pijah helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Ubah nama"
 
-#~ msgid "Name:"
-#~ msgstr "Nama:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Klik pada nama ruang kerja untuk mengubahnya"
 
@@ -1227,9 +1243,6 @@ msgstr "Tak dapat pijah helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Ruang Kerja dan Margin"
 
-#~ msgid "Margins"
-#~ msgstr "Margin"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Pengaturan Manajer Jendela"
 
diff --git a/po/is.po b/po/is.po
index aec3704..7d39a83 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: is\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-12-07 08:01+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki at nett.is>\n"
 "Language-Team: Icelandic <translation-team-is at lists.sourceforge.net>\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
@@ -79,237 +79,237 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr ""
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gluggastjóri"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
 msgstr ""
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr ""
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
 msgstr ""
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Vinnusvæði"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Útlit hnappa</b>"
-
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr ""
+msgid "<b>_Theme</b>"
+msgstr "<b>Þe_ma</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
+msgid "<b>Title fon_t</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
+msgid "<b>Title _alignment</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
+msgid "Click and drag the buttons to change the layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr ""
+msgid "Title"
+msgstr "Titill"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
+msgid "The window title cannot be removed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr ""
+msgid "Active"
+msgstr "Virkt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr ""
+msgid "Menu"
+msgstr "Valmynd"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr ""
+msgid "Stick"
+msgstr "Líma"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr ""
+msgid "Shade"
+msgstr "Skyggja"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>Þe_ma</b>"
+msgid "Minimize"
+msgstr "Lágmarka"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Hámarka"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "Loka"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Falið"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+msgid "<b>Button layout</b>"
+msgstr "<b>Útlit hnappa</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stíll"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
+msgid "_Reset to Defaults"
+msgstr "Endu_rheimta upprunaleg gildi"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
 msgstr ""
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr ""
+msgid "Ke_yboard"
+msgstr "L_yklaborð"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Virkt"
+msgid "Clic_k to focus"
+msgstr "Smella til að vir_kja"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Nánar"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
+msgid "Focus follows _mouse"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:24
+msgid "_Delay before window receives focus:"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Smella til að vir_kja"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Loka"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
+msgid "Automatically give focus to _newly created windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Vega_lengd:"
+msgid "<b>New window focus</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
+msgid "Automatically _raise windows when they receive focus"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Falið"
+msgid "Delay _before raising focused window:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
+msgid "<b>Raise on focus</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
+msgid "Raise window when clicking _inside application window"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "L_yklaborð"
+msgid "<b>Raise on click</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Hámarka"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Virkni"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Valmynd"
+msgid "Snap windows to screen _border"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Lágmarka"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
+msgid "Snap windows to other _windows"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Skyggja"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:40
+msgid "Dis_tance:"
+msgstr "Vega_lengd:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
 msgstr ""
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Líma"
+msgid "<i>Wide</i>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
+msgid "<b>Windows snapping</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titill"
+msgid "Wrap workspaces when _dragging a window off the screen"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-msgid "Wrap workspaces when _dragging a window off the screen"
+msgid "<b>Wrap workspaces</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgid "Hide content of windows when _resizing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
+msgid "Hide content of windows when _moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Virkni"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Endu_rheimta upprunaleg gildi"
+msgid "<b>Double click _action</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stíll"
+msgid "Ad_vanced"
+msgstr "_Nánar"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -649,45 +649,46 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Stórt</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Ógegnsætt</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Gegnsætt</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
+msgid "Switch to win_dow's workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
@@ -695,153 +696,162 @@ msgid "Do _nothing"
 msgstr "_Gera ekkert"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
+msgid "Restore original _size of maximized windows when moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
+msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
+msgid "Keep urgent windows _blinking repeatedly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
+msgid "_Accessibility"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
+msgid "_Workspaces"
+msgstr "_Vinnusvæði"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+msgid "<i>Large</i>"
+msgstr "<i>Stórt</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
+msgid "_Enable display compositing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
+msgid "Opaci_ty of window decorations:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr ""
+msgid "<i>Transparent</i>"
+msgstr "<i>Gegnsætt</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr ""
+msgid "<i>Opaque</i>"
+msgstr "<i>Ógegnsætt</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
+msgid "Opacity of _inactive windows:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
+msgid "Opacity of windows during resi_ze:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Vinnusvæði"
+msgid "C_ompositor"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Spássíur</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Fjöldi _vinnusvæða:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Vinnusvæði</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Heiti:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Fjöldi _vinnusvæða:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Spássíur</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -849,35 +859,35 @@ msgstr "Fjöldi _vinnusvæða:"
 msgid "%s (on %s)"
 msgstr "%s (á %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Prenta upplýsingar um útgáfu og hætta"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Skrifa \"%s --help\"  fyrir notkun."
@@ -1009,8 +1019,8 @@ msgstr ""
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Vinnusvæði</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Breyta heiti vinnusvæðis"
-
-#~ msgid "_Name:"
-#~ msgstr "_Heiti:"
diff --git a/po/it.po b/po/it.po
index 01d44ff..3d6898a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,19 +4,19 @@
 # Gabriele Modena <randall at email.it>, 2005.
 # Alex Dupre <ale at FreeBSD.org>, 2004, 2005.
 # Cristian Marchi <cri.penta at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 05:42+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-09-08 11:45+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 
 # # GLOSSARIO
 # # focus = fuoco (riferito alla finestra quando diventa attiva)
@@ -91,240 +91,240 @@ msgid "Settings manager socket"
 msgstr "Socket del gestore delle impostazioni"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configurazione del comportamento della finestra e delle scorciatoie"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestore delle finestre"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Regolazione del comportamento della finestra e delle scorciatoie"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configurazione del comportamento della finestra e delle scorciatoie"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Regolazioni del gestore delle finestre"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Impostazione del numero e del nome degli spazi di lavoro"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Regolazione del comportamento della finestra e delle scorciatoie"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Spazi di lavoro"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Spostamento e ridimensionamento</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Disposizione dei pulsanti</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Azione per il doppio clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modello di fuoco</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Cara_ttere del titolo</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fuoco per le nuove finestre</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Allineamento del titolo</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Sollevamento al clic</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Trascinare i pulsanti per cambiarne la disposizione"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Sollevamento se a fuoco</b>"
+msgid "Title"
+msgstr "Titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Allineamento del titolo</b>"
+msgid "The window title cannot be removed"
+msgstr "Il titolo della finestra non può essere rimosso"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Cara_ttere del titolo</b>"
+msgid "Active"
+msgstr "Attivi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Scorci_atoie della finestra</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Finestre magnetiche</b>"
+msgid "Stick"
+msgstr "Blocca"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Scorrimento degli spazi di lavoro</b>"
+msgid "Shade"
+msgstr "Arrotola"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimizza"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Massimizza"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lungo</i>"
+msgid "Close"
+msgstr "Chiudi"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Nascosti"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Corto</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Disposizione dei pulsanti</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stile"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Piccola</i>"
+msgid "_Reset to Defaults"
+msgstr "_Ripristina predefiniti"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Scorci_atoie della finestra</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Ampia</i>"
+msgid "Ke_yboard"
+msgstr "Tasti_era"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Attivi"
+msgid "Clic_k to focus"
+msgstr "Metti a fuoco al c_lic"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vanzate"
+msgid "Focus follows _mouse"
+msgstr "Il fuoco segue il mo_use"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Solleva automaticamente le finest_re quando vengono messe a fuoco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Metti a fuoco automaticamente le _nuove finestre create"
+msgid "_Delay before window receives focus:"
+msgstr "Ritar_do prima di sollevare la finestra con il fuoco"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Metti a fuoco al c_lic"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Trascinare i pulsanti per cambiarne la disposizione"
+msgid "<i>Short</i>"
+msgstr "<i>Corto</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Chiudi"
+msgid "<i>Long</i>"
+msgstr "<i>Lungo</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modello di fuoco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Ritardo prima di soll_evare la finestra con il fuoco:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Metti a fuoco automaticamente le _nuove finestre create"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tanza:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fuoco per le nuove finestre</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Il fuoco segue il mo_use"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Solleva automaticamente le finest_re quando vengono messe a fuoco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Nascosti"
+msgid "Delay _before raising focused window:"
+msgstr "Ritardo prima di soll_evare la finestra con il fuoco:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Nascondi il contenuto delle finestre quando vengono sp_ostate"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Sollevamento se a fuoco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Nascondi il contenuto delle finestre quando vengono ri_dimensionate"
+msgid "Raise window when clicking _inside application window"
+msgstr "Solleva la finestra quando si fa clic al suo intern_o"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Tasti_era"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Sollevamento al clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Massimizza"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fuoco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Calamita le finestre ai _bordi dello schermo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimizza"
+msgid "Snap windows to other _windows"
+msgstr "Calamita le finestre tra di _loro"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Solleva la finestra quando si fa clic al suo intern_o"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Arrotola"
+msgid "Dis_tance:"
+msgstr "Dis_tanza:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Calamita le finestre tra di _loro"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Calamita le finestre ai _bordi dello schermo"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Piccola</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Blocca"
+msgid "<i>Wide</i>"
+msgstr "<i>Ampia</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Azione da intraprendere al doppio clic sulla barra del titolo"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Finestre magnetiche</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Il titolo della finestra non può essere rimosso"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Scorri gli spazi di lavoro se il p_untatore raggiunge il bordo dello schermo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titolo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Scorri gli spazi di lavoro se una finestra viene t_rascinata fuori dallo "
 "schermo"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Resisten_za ai bordi :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Scorrimento degli spazi di lavoro</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Scorri gli spazi di lavoro se il p_untatore raggiunge il bordo dello schermo"
+msgid "Hide content of windows when _resizing"
+msgstr "Nascondi il contenuto delle finestre quando vengono ri_dimensionate"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Ritar_do prima di sollevare la finestra con il fuoco"
+msgid "Hide content of windows when _moving"
+msgstr "Nascondi il contenuto delle finestre quando vengono sp_ostate"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Resisten_za ai bordi :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Spostamento e ridimensionamento</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fuoco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Azione da intraprendere al doppio clic sulla barra del titolo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Ripristina predefiniti"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Azione per il doppio clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stile"
+msgid "Ad_vanced"
+msgstr "A_vanzate"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -662,214 +662,224 @@ msgstr ""
 "Questo riporterà tutte le scorciatoie ai valori predefiniti. Continuare "
 "davvero?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Grande</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaca</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Salta le finestre che _hanno le proprietà \"salta impaginatore\"\n"
+"o \"salta barra dei processi\" impostate"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Includi le finestre _nascoste (ovvero minimizzate)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Trasparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Scorri le finestre di t_utti gli spazi di lavoro"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Atti_va la prevenzione al furto del fuoco"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
+"_Disegna la cornice attorno alle finestre selezionate mentre si scorrono"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Al centro dello sc_hermo"
+msgid "C_ycling"
+msgstr "Scorrimen_to"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Di norma, posiziona le finestre:"
+msgid "Activate _focus stealing prevention"
+msgstr "Atti_va la prevenzione al furto del fuoco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "C_ompositore"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Rispetta i su_ggerimenti sul fuoco dello standard ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Scorrimen_to"
+msgid "When a window raises itself:"
+msgstr "Quando una finestra si solleva:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Scorri le finestre di t_utti gli spazi di lavoro"
+msgid "_Bring window on current workspace"
+msgstr "Porta la finestra nello spazio di lavoro co_rrente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Mostra direttamente la finestra di copertura a sc_hermo intero"
+msgid "Switch to win_dow's workspace"
+msgstr "Trasferisciti allo spazio di _lavoro della finestra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Non fare _niente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "_Nascondi la cornice delle finestre massimizzate"
+msgid "Key used to _grab and move windows:"
+msgstr "Tasto usato per affe_rrare e spostare le finestre:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Rispetta i su_ggerimenti sul fuoco dello standard ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Solleva le finestre alla pressione di qualunque pulsante del mo_use"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Fa in modo che le finestre urgenti _lampeggino ripetutamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "_Nascondi la cornice delle finestre massimizzate"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tasto usato per affe_rrare e spostare le finestre:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Ripristina la _dimensione originale delle finestre massimizzate quando "
+"vengono spostate"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notifica l'ur_genza facendo lampeggiare la decorazione della finestra"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Usa la resistenza dei bordi inv_ece delle finestre magnetiche"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opacità delle d_ecorazioni della finestra:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notifica l'ur_genza facendo lampeggiare la decorazione della finestra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacità delle finestre i_nattive:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Fa in modo che le finestre urgenti _lampeggino ripetutamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacità de_lle finestre a comparsa:"
+msgid "_Accessibility"
+msgstr "_Accessibilità"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacità delle finestre _durante lo spostamento:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Utilizza la rotella del mo_use sulla scrivania per cambiare spazio di lavoro"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacità delle finestre _durante il ridimensionamento:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Ripristina la _dimensione originale delle finestre massimizzate quando "
-"vengono spostate"
+"_Ricorda e richiama lo spazio di lavoro precedente\n"
+"se il cambiamento avviene con una scorciatoia da tastiera"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostra l'ombra al di sotto delle finestre della doc_k"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Scorri gli spazi di lavoro secondo l'effettiva disposizione del_la scrivania"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostra ombre sotto le finestre no_rmali"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Continua a scorrere gli spazi di lavoro al raggiungimento del pri_mo o "
+"dell'ultimo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostra le ombre sotto alle finestre a co_mparsa"
+msgid "_Workspaces"
+msgstr "_Spazi di lavoro"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Trasferisciti allo spazio di _lavoro della finestra"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sotto al puntatore del mo_use"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Usa la resistenza dei bordi inv_ece delle finestre magnetiche"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
-"Utilizza la rotella del mo_use sulla scrivania per cambiare spazio di lavoro"
+"Dimensione _minima delle finestre per provocare il posizionamento "
+"intelligente:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Quando una finestra si solleva:"
+msgid "<i>Large</i>"
+msgstr "<i>Grande</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Di norma, posiziona le finestre:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Scorri gli spazi di lavoro secondo l'effettiva disposizione del_la scrivania"
+msgid "At the _center of the screen"
+msgstr "Al centro dello sc_hermo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Continua a scorrere gli spazi di lavoro al raggiungimento del pri_mo o "
-"dell'ultimo"
+msgid "Under the mouse _pointer"
+msgstr "Sotto al puntatore del mo_use"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Accessibilità"
+msgid "_Placement"
+msgstr "Posi_zionamento"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Porta la finestra nello spazio di lavoro co_rrente"
+msgid "_Enable display compositing"
+msgstr "A_bilita la visualizzazione composita"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
-"_Disegna la cornice attorno alle finestre selezionate mentre si scorrono"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Mostra direttamente la finestra di copertura a sc_hermo intero"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "A_bilita la visualizzazione composita"
+msgid "Show shadows under _regular windows"
+msgstr "Mostra ombre sotto le finestre no_rmali"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostra le ombre sotto alle finestre a co_mparsa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Includi le finestre _nascoste (ovvero minimizzate)"
+msgid "Show shadows under _dock windows"
+msgstr "Mostra l'ombra al di sotto delle finestre della doc_k"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
-"Dimensione _minima delle finestre per provocare il posizionamento "
-"intelligente:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opacità delle d_ecorazioni della finestra:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "Posi_zionamento"
+msgid "<i>Transparent</i>"
+msgstr "<i>Trasparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Solleva le finestre alla pressione di qualunque pulsante del mo_use"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaca</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Ricorda e richiama lo spazio di lavoro precedente\n"
-"se il cambiamento avviene con una scorciatoia da tastiera"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacità delle finestre i_nattive:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacità delle finestre _durante lo spostamento:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Salta le finestre che _hanno le proprietà \"salta impaginatore\"\n"
-"o \"salta barra dei processi\" impostate"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacità delle finestre _durante il ridimensionamento:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacità de_lle finestre a comparsa:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Spazi di lavoro"
+msgid "C_ompositor"
+msgstr "C_ompositore"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margini</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Numero degli spazi di lavoro:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Spazi di lavoro</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nome:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "I bordi sono aree agli angoli dello schermo dove non verrà posta alcuna "
 "finestra"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Numero degli spazi di lavoro:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margini</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1041,12 +1051,15 @@ msgstr "Si è verificato un errore leggendo i dati dal processo figlio: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Impossibile creare la finestra dell'assistente: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Impostazione del numero e del nome degli spazi di lavoro"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Spazi di lavoro</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Cambia nome dello spazio di lavoro"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nome:"
-
 #~ msgid "Hide"
 #~ msgstr "Nascondi"
 
diff --git a/po/ja.po b/po/ja.po
index 22b1a24..96f5cfb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17,14 +17,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.5.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-11-19 23:47+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -91,241 +91,241 @@ msgid "Settings manager socket"
 msgstr "マネージャソケットの設定"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "ウィンドウの振る舞いとショートカットキーを設定します"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "ウィンドウマネージャ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "ウィンドウの振る舞いと効果を微調整します"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "ウィンドウの振る舞いとショートカットキーを設定します"
 
 # FIXME: Q_()
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "ウィンドウマネージャ (詳細)"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "ワークスペースの数と名前を設定します"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "ウィンドウの振る舞いと効果を微調整します"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "ワークスペース"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>移動とサイズ変更</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>ボタンの配置</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>ダブルクリック時の動作</b>(_A)"
+msgid "<b>_Theme</b>"
+msgstr "<b>テーマ</b>(_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>フォーカスモデル</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>タイトルのフォント</b>(_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>新規ウィンドウのフォーカス</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>タイトルの位置</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>クリックで前面に出す</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "レイアウトを変更するにはボタンをクリックしてドラッグしてください"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>フォーカスで前面へ</b>"
+msgid "Title"
+msgstr "タイトル"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>タイトルの位置</b>(_A)"
+msgid "The window title cannot be removed"
+msgstr "ウィンドウタイトルは除去できません"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>タイトルのフォント</b>(_T)"
+msgid "Active"
+msgstr "表示する"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>ウィンドウショートカットキー</b>(_S)"
+msgid "Menu"
+msgstr "メニュー"
 
+# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>ウィンドウのスナップ</b>"
+msgid "Stick"
+msgstr "貼る"
 
+# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>ワークスペースの循環</b>"
+msgid "Shade"
+msgstr "折り畳む"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>テーマ</b>(_T)"
+msgid "Minimize"
+msgstr "最小化"
+
+# FIXME:
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "最大化"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>長い</i>"
+msgid "Close"
+msgstr "閉じる"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "表示しない"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>短い</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>ボタンの配置</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "スタイル(_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>小さい</i>"
+msgid "_Reset to Defaults"
+msgstr "デフォルトに戻す(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>ウィンドウショートカットキー</b>(_S)"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>大きい</i>"
+msgid "Ke_yboard"
+msgstr "キーボード(_Y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "表示する"
+msgid "Clic_k to focus"
+msgstr "クリックでフォーカス(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "詳細(_V)"
+msgid "Focus follows _mouse"
+msgstr "マウスに従ってフォーカス(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "ウィンドウがフォーカスを取得した場合自動的に前面に出す(_R)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "新規作成されたウィンドウに自動的にフォーカスを移動する(_N)"
+msgid "_Delay before window receives focus:"
+msgstr "ウィンドウがフォーカスされるまでの遅延時間(_D)"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "クリックでフォーカス(_K)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "レイアウトを変更するにはボタンをクリックしてドラッグしてください"
+msgid "<i>Short</i>"
+msgstr "<i>短い</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "閉じる"
+msgid "<i>Long</i>"
+msgstr "<i>長い</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>フォーカスモデル</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "フォーカス取得後、前面に出すまでの遅延時間(_B):"
+msgid "Automatically give focus to _newly created windows"
+msgstr "新規作成されたウィンドウに自動的にフォーカスを移動する(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "距離(_T):"
+msgid "<b>New window focus</b>"
+msgstr "<b>新規ウィンドウのフォーカス</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "マウスに従ってフォーカス(_M)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "ウィンドウがフォーカスを取得した場合自動的に前面に出す(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "表示しない"
+msgid "Delay _before raising focused window:"
+msgstr "フォーカス取得後、前面に出すまでの遅延時間(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "移動時にウィンドウの内容を表示しない(_M)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>フォーカスで前面へ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "大きさ変更時にウィンドウの内容を表示しない(_R)"
+msgid "Raise window when clicking _inside application window"
+msgstr "アプリケーションウィンドウ内でクリックした場合前面に出す(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "キーボード(_Y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>クリックで前面に出す</b>"
 
-# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "最大化"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "フォーカス(_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "メニュー"
+msgid "Snap windows to screen _border"
+msgstr "画面の境界でウィンドウを止める(_B)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "最小化"
+msgid "Snap windows to other _windows"
+msgstr "他のウィンドウでウィンドウを止める(_W)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "アプリケーションウィンドウ内でクリックした場合前面に出す(_I)"
-
-# FIXME:
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "折り畳む"
+msgid "Dis_tance:"
+msgstr "距離(_T):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "他のウィンドウでウィンドウを止める(_W)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "画面の境界でウィンドウを止める(_B)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>小さい</i>"
 
-# FIXME:
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "貼る"
+msgid "<i>Wide</i>"
+msgstr "<i>大きい</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "タイトルバーをダブルクリックした時の動作"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>ウィンドウのスナップ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "ウィンドウタイトルは除去できません"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "ポインタが画面端に来たらワークスペースを循環する(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "タイトル"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "ウィンドウを画面外へドラッグするとワークスペースを循環する(_D)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "エッジ抵抗(_E):"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>ワークスペースの循環</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "ポインタが画面端に来たらワークスペースを循環する(_P)"
+msgid "Hide content of windows when _resizing"
+msgstr "大きさ変更時にウィンドウの内容を表示しない(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "ウィンドウがフォーカスされるまでの遅延時間(_D)"
+msgid "Hide content of windows when _moving"
+msgstr "移動時にウィンドウの内容を表示しない(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "エッジ抵抗(_E):"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>移動とサイズ変更</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "フォーカス(_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "タイトルバーをダブルクリックした時の動作"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "デフォルトに戻す(_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>ダブルクリック時の動作</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "スタイル(_S)"
+msgid "Ad_vanced"
+msgstr "詳細(_V)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -665,221 +665,231 @@ msgid ""
 "do this?"
 msgstr ""
 "これはすべてのショートカットキーをデフォルト値にリセットします。本当によろし"
-"いですか?"
-
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>大きい</i>"
+"いですか?"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>不透明</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"ページャーを飛ばす\" または \"タスクバーを飛ばす\" というプロパティが\n"
+"設定されているウィンドウを飛ばす(_S)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "アイコン化されたなどの隠しウィンドウも含める(_I)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>透明</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "すべてのワークスペースを循環させる(_T)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "アクティブ化フォーカスの横取りを防ぐ(_F)"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "循環中選択したウィンドウの枠を描画する(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "画面の中央(_C)"
+msgid "C_ycling"
+msgstr "循環(_Y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "デフォルトのウィンドウ配置:"
+msgid "Activate _focus stealing prevention"
+msgstr "アクティブ化フォーカスの横取りを防ぐ(_F)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "合成処理(_O)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "ICCCM 標準フォーカスヒントに則る(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "循環(_Y)"
+msgid "When a window raises itself:"
+msgstr "ウィンドウ自身が前面に出る場合:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "すべてのワークスペースを循環させる(_T)"
+msgid "_Bring window on current workspace"
+msgstr "ウィンドウを現在のワークスペースに移す(_B)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "全画面オーバーレイウィンドウを直接表示する(_F)"
+msgid "Switch to win_dow's workspace"
+msgstr "ウィンドウのワークスペースへ切り換える(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "何もしない(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "最大化する時はウィンドウの枠を隠す(_F)"
+msgid "Key used to _grab and move windows:"
+msgstr "ウィンドウを掴んだり移動したりするために使うキー(_G):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "ICCCM 標準フォーカスヒントに則る(_S)"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "いずれかのマウスボタンが押されている時にウィンドウを前面に出す(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "緊急通知のあるウィンドウは点滅を続ける(_B)"
+msgid "Hide _frame of windows when maximized"
+msgstr "最大化する時はウィンドウの枠を隠す(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "ウィンドウを掴んだり移動したりするために使うキー(_G):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "最大化されたウィンドウを移動する時は大きさを元に戻す(_S)"
 
+# FIXME: should be revised
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "緊急通知のあるウィンドウの枠を点滅する(_U)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ウィンドウを止める代わりにエッジ抵抗を使用する(_E)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "ウィンドウ枠の透明度(_T):"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "緊急通知のあるウィンドウの枠を点滅する(_U)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "非アクティブウィンドウの透明度(_I):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "緊急通知のあるウィンドウは点滅を続ける(_B)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
+# FIXME: i hate this transliteration
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "ポップアップウィンドウの透明度(_S):"
+msgid "_Accessibility"
+msgstr "アクセシビリティ(_A)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "移動中のウィンドウの透明度(_M):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"ワークスペースの切り替えにデスクトップ上でのマウスホイールを使用する(_M)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "大きさ変更中のウィンドウの透明度(_Z):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "最大化されたウィンドウを移動する時は大きさを元に戻す(_S)"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"ショートカットキーを使用して切り替える時に\n"
+"以前のワークスペースを覚えておく(_R)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "ドックウィンドウに影を落とす(_D)"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "実際のデスクトップレイアウトに応じてワークスペースを循環する(_L)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "通常のウィンドウに影を落とす(_R)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "先頭または最後のワークスペースに来たら循環する(_F)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "ポップアップウィンドウに影を落とす(_U)"
+msgid "_Workspaces"
+msgstr "ワークスペース(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "ウィンドウのワークスペースへ切り換える(_D)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "マウスポインタの下(_P)"
-
-# FIXME: should be revised
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ウィンドウを止める代わりにエッジ抵抗を使用する(_E)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"ワークスペースの切り替えにデスクトップ上でのマウスホイールを使用する(_M)"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "スマート配置を行うきっかけとなる最小のウィンドウサイズ(_M):"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "ウィンドウ自身が前面に出る場合:"
+msgid "<i>Large</i>"
+msgstr "<i>大きい</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "デフォルトのウィンドウ配置:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "実際のデスクトップレイアウトに応じてワークスペースを循環する(_L)"
+msgid "At the _center of the screen"
+msgstr "画面の中央(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "先頭または最後のワークスペースに来たら循環する(_F)"
+msgid "Under the mouse _pointer"
+msgstr "マウスポインタの下(_P)"
 
-# FIXME: i hate this transliteration
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "アクセシビリティ(_A)"
+msgid "_Placement"
+msgstr "配置(_P)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "ウィンドウを現在のワークスペースに移す(_B)"
+msgid "_Enable display compositing"
+msgstr "合成処理を有効にする(_E)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "循環中選択したウィンドウの枠を描画する(_D)"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "全画面オーバーレイウィンドウを直接表示する(_F)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "合成処理を有効にする(_E)"
+msgid "Show shadows under _regular windows"
+msgstr "通常のウィンドウに影を落とす(_R)"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "ポップアップウィンドウに影を落とす(_U)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "アイコン化されたなどの隠しウィンドウも含める(_I)"
+msgid "Show shadows under _dock windows"
+msgstr "ドックウィンドウに影を落とす(_D)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "スマート配置を行うきっかけとなる最小のウィンドウサイズ(_M):"
+msgid "Opaci_ty of window decorations:"
+msgstr "ウィンドウ枠の透明度(_T):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "配置(_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>透明</i>"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "いずれかのマウスボタンが押されている時にウィンドウを前面に出す(_R)"
+msgid "<i>Opaque</i>"
+msgstr "<i>不透明</i>"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"ショートカットキーを使用して切り替える時に\n"
-"以前のワークスペースを覚えておく(_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "非アクティブウィンドウの透明度(_I):"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "移動中のウィンドウの透明度(_M):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"ページャーを飛ばす\" または \"タスクバーを飛ばす\" というプロパティが\n"
-"設定されているウィンドウを飛ばす(_S)"
+msgid "Opacity of windows during resi_ze:"
+msgstr "大きさ変更中のウィンドウの透明度(_Z):"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "ポップアップウィンドウの透明度(_S):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "ワークスペース(_W)"
+msgid "C_ompositor"
+msgstr "合成処理(_O)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>余白</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "ワークスペースの数(_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>ワークスペース</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "名前(_N):"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "余白とは画面端のウィンドウが置かれない空間のことです"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "ワークスペースの数(_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>余白</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -887,35 +897,35 @@ msgstr "ワークスペースの数(_N):"
 msgid "%s (on %s)"
 msgstr "%s (ホスト %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "バックグラウンドに fork する"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "バックグラウンドに fork する (未サポート)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "合成処理モードを設定する"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "合成処理モードを設定する (未サポート)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "既存のウィンドウマネージャを置き換える"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "バージョン情報を表示して終了する"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[引数...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "\"%s --help\" と入力すると使用法が表示されます。"
@@ -1047,8 +1057,11 @@ msgstr "子プロセスからのデータ読み込みエラーです: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "ヘルパーダイアログを生成できませんでした: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "ワークスペースの数と名前を設定します"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>ワークスペース</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "ワークスペース名の変更"
-
-#~ msgid "_Name:"
-#~ msgstr "名前(_N):"
diff --git a/po/ka.po b/po/ka.po
index 2654a47..ad05164 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-08-24 23:50+0400\n"
 "Last-Translator: Dimitri Gogelia <delphi.knight at gmail.com>\n"
 "Language-Team: Georgian <delphi.knight at gmail.com>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
 "X-Poedit-Language: Georgian\n"
 "X-Poedit-Country: GEORGIA\n"
 
@@ -74,236 +74,236 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
+msgid "Window Manager"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
-msgid "Window Manager"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
+msgid "Window Manager Tweaks"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
-msgid "Window Manager Tweaks"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
 msgstr ""
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr ""
-
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
+msgid "<b>_Theme</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
+msgid "<b>Title fon_t</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
+msgid "<b>Title _alignment</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
+msgid "Click and drag the buttons to change the layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
+msgid "Title"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
+msgid "The window title cannot be removed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
+msgid "Active"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
+msgid "Menu"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
+msgid "Stick"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
+msgid "Shade"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
+msgid "Minimize"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
 msgstr ""
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
+msgid "Close"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
 msgstr ""
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
+msgid "<b>Button layout</b>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
 msgstr ""
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
 msgstr ""
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
+msgid "Ke_yboard"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
+msgid "Clic_k to focus"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
+msgid "Focus follows _mouse"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
+msgid "_Delay before window receives focus:"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
+msgid "<i>Short</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
+msgid "<i>Long</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
+msgid "Automatically give focus to _newly created windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
+msgid "<b>New window focus</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
+msgid "Automatically _raise windows when they receive focus"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
+msgid "Delay _before raising focused window:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
+msgid "<b>Raise on focus</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
+msgid "Raise window when clicking _inside application window"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
+msgid "<b>Raise on click</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
+msgid "Snap windows to screen _border"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
+msgid "Snap windows to other _windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
+msgid "Dis_tance:"
 msgstr ""
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
 msgstr ""
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
+msgid "<i>Wide</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
+msgid "<b>Windows snapping</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
+msgid "Wrap workspaces when _dragging a window off the screen"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-msgid "Wrap workspaces when _dragging a window off the screen"
+msgid "<b>Wrap workspaces</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgid "Hide content of windows when _resizing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
+msgid "Hide content of windows when _moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
+msgid "The action to perform when the title-bar is double-clicked"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
+msgid "<b>Double click _action</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
+msgid "Ad_vanced"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-settings.c:220
@@ -640,45 +640,46 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
+msgid "Cycle _through windows on all workspaces"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
+msgid "Switch to win_dow's workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
@@ -686,152 +687,160 @@ msgid "Do _nothing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
+msgid "Restore original _size of maximized windows when moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
+msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
+msgid "Keep urgent windows _blinking repeatedly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
+msgid "_Accessibility"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
+msgid "_Workspaces"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
+msgid "_Enable display compositing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
+msgid "Opaci_ty of window decorations:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
+msgid "Opacity of _inactive windows:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
+msgid "Opacity of windows during resi_ze:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
+msgid "C_ompositor"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "სახელი:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+msgid "_Margins"
 msgstr ""
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
@@ -840,35 +849,35 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1003,7 +1012,3 @@ msgstr ""
 #, fuzzy
 #~ msgid "_Name:"
 #~ msgstr "სახელი:"
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "სახელი:"
diff --git a/po/kk.po b/po/kk.po
index d28008b..1a338ca 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-16 02:30+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-12-17 22:52+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -82,237 +82,237 @@ msgid "Settings manager socket"
 msgstr "Баптаулар басқарушының сокеті"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Терезе әрекеттерін мен жарлықтарды баптау"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Терезелер басқарушы"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Терезе әрекеттерін мен жарлықтарды туралау"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Терезе әрекеттерін мен жарлықтарды баптау"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Терезелер басқарушының қу баптаулары"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Жұмыс орындарының нөмірлерін мен аттарын орнату"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Терезе әрекеттерін мен жарлықтарды туралау"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Жұмыс орындары"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Терезені жылжыту мен өлшемдерін өзгерту</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Батырмалардың орналасуы</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Қ_ос шерту әрекеті</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Тақырыбы</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Терезе фокусы</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>А_таудың қарібі</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Жаңа терезе фокусты алады</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Атаудың тур_алауы</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Шерткенде терезені көрсету</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Орналасуын ауыстыру үшін батырмаларды тартып апарыңыз"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Тышқан тілшесі өткен кезде терезені көрсету</b>"
+msgid "Title"
+msgstr "Атауы"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Атаудың тур_алауы</b>"
+msgid "The window title cannot be removed"
+msgstr "Терезе атауын өшіруге болмайды"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>А_таудың қарібі</b>"
+msgid "Active"
+msgstr "Белсенді"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Терезе _жарлықтары</b>"
+msgid "Menu"
+msgstr "Мәзір"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Терезелердің жабысуы</b>"
+msgid "Stick"
+msgstr "Жабыстыру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Жұмыс орындарын ауыстыру</b>"
+msgid "Shade"
+msgstr "Атау жолағына жинау"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Тақырыбы</b>"
+msgid "Minimize"
+msgstr "Қайыру"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Максималды қылу"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Ұзақ</i>"
+msgid "Close"
+msgstr "Жабу"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Жасырын"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Қысқа</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Батырмалардың орналасуы</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Стиль"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Кіші</i>"
+msgid "_Reset to Defaults"
+msgstr "_Бастапқы түріне келтіру"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Терезе _жарлықтары</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Кең</i>"
+msgid "Ke_yboard"
+msgstr "Пер_нетақта"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Белсенді"
+msgid "Clic_k to focus"
+msgstr "Фо_кус алу үшін шерту керек"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "К_еңейтілген"
+msgid "Focus follows _mouse"
+msgstr "Фокус ты_шқанның соңынан жүреді"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Те_резелер фокус алғанда оларды көтеру"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Жаңа жасалға_н терезелерге фокус беру"
+msgid "_Delay before window receives focus:"
+msgstr "Терезе фокус алғанға дейінгі кү_ту:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Фо_кус алу үшін шерту керек"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Орналасуын ауыстыру үшін батырмаларды тартып апарыңыз"
+msgid "<i>Short</i>"
+msgstr "<i>Қысқа</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Жабу"
+msgid "<i>Long</i>"
+msgstr "<i>Ұзақ</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Терезе фокусы</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Ф_окус алған терезені көтеру алдындағы уақыт:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Жаңа жасалға_н терезелерге фокус беру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Қашық_тық:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Жаңа терезе фокусты алады</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Фокус ты_шқанның соңынан жүреді"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Те_резелер фокус алғанда оларды көтеру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Жасырын"
+msgid "Delay _before raising focused window:"
+msgstr "Ф_окус алған терезені көтеру алдындағы уақыт:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Терезені жылжытқанда оның құрамасын жа_сыру"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Тышқан тілшесі өткен кезде терезені көрсету</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Терезе өлшемдерін ауыстырғанда оның құ_рамасын жасыру"
+msgid "Raise window when clicking _inside application window"
+msgstr "Бағдар_лама терезесіне шерткенде оны көтеру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Пер_нетақта"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Шерткенде терезені көрсету</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Максималды қылу"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Мәзір"
+msgid "Snap windows to screen _border"
+msgstr "Терезенің экран жақтарына жабыс_уы"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Қайыру"
+msgid "Snap windows to other _windows"
+msgstr "Терезенің басқа терезелерге жаб_ысуы"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Бағдар_лама терезесіне шерткенде оны көтеру"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Атау жолағына жинау"
+msgid "Dis_tance:"
+msgstr "Қашық_тық:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Терезенің басқа терезелерге жаб_ысуы"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Терезенің экран жақтарына жабыс_уы"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Кіші</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Жабыстыру"
+msgid "<i>Wide</i>"
+msgstr "<i>Кең</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Бұл әрекет терезе атауына қос шерткенде орындалады"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Терезелердің жабысуы</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Терезе атауын өшіруге болмайды"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "_Тышқан курсоры экран сыртына шыққан кезде жұмыс орнын ауыстыру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Атауы"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Терезені экран сыртына тарқанда жұ_мыс орнын ауыстыру"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Шеттердегі кедергі:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Жұмыс орындарын ауыстыру</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "_Тышқан курсоры экран сыртына шыққан кезде жұмыс орнын ауыстыру"
+msgid "Hide content of windows when _resizing"
+msgstr "Терезе өлшемдерін ауыстырғанда оның құ_рамасын жасыру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Терезе фокус алғанға дейінгі кү_ту:"
+msgid "Hide content of windows when _moving"
+msgstr "Терезені жылжытқанда оның құрамасын жа_сыру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Шеттердегі кедергі:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Терезені жылжыту мен өлшемдерін өзгерту</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Фокус"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Бұл әрекет терезе атауына қос шерткенде орындалады"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Бастапқы түріне келтіру"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Қ_ос шерту әрекеті</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Стиль"
+msgid "Ad_vanced"
+msgstr "К_еңейтілген"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -650,206 +650,216 @@ msgstr ""
 "Бұл әрекет жарлықтардың барлығын бастапқы түріне келтіреді. Осыны шынымен "
 "қалайсыз ба?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Үлкен</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Мөлдір емес</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"Ауыстырғышта көрсетпеу\" және \"есептер жолағында көрсетпеу\"\n"
+" қасиеттері орнатылған терезелерді аттап өту"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Жасырын (қайырылған) терезелерді қоса"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Мөлдір</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Ауысу кезінде барлық ж_ұмыс орындардағы терезелерді қолдану"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Енгізу кезіндегі фокусты ұрлауға тыйым са_лу"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "Ауы_су кезінде ерекшеленген терезеге қосымша қоршау салу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Экран ор_тасында"
+msgid "C_ycling"
+msgstr "Терезелер арасында ау_ысу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Жаңа терезелерді орналастыру:"
+msgid "Activate _focus stealing prevention"
+msgstr "Енгізу кезіндегі фокусты ұрлауға тыйым са_лу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Эффектер"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Қалыпты ICCCM _фокуст тәсілін елемеу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Терезелер арасында ау_ысу"
+msgid "When a window raises itself:"
+msgstr "Терезе өздігімен көтерілсе:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Ауысу кезінде барлық ж_ұмыс орындардағы терезелерді қолдану"
+msgid "_Bring window on current workspace"
+msgstr "Т_ерезені ағымдағы жұмыс орнына апару"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Толық экран _оверлейдегі терезелерді тура көрсету"
+msgid "Switch to win_dow's workspace"
+msgstr "Тере_зенің жұмыс орнына ауысу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Ешнәрсе жасамау"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "_Максималды терезенің қоршауын жасыру"
+msgid "Key used to _grab and move windows:"
+msgstr "Терезелерді ұстап пен жылжыту үшін қол_данылатын перне:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Қалыпты ICCCM _фокуст тәсілін елемеу"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Тышқанның кез-кел_ген батырмасы басылған кезде терезені көтеру"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Назарды талап ететін терезелер уақыт өте жыпылықта_й береді"
+msgid "Hide _frame of windows when maximized"
+msgstr "_Максималды терезенің қоршауын жасыру"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Терезелерді ұстап пен жылжыту үшін қол_данылатын перне:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Максималды терезелерді жы_лжытқан кезде өлшемдерін бастапқы мәнге келтіру"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Терезеге назар аудару керек _болса оның қоршауын жыпылықтату"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Экран шеттердің кедергісін терезелер _жабысуының орнына қолдану"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Терезе қ_оршауының мөлдірлілігі:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Терезеге назар аудару керек _болса оның қоршауын жыпылықтату"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Белсенді емес терезелердің _ мөлдірлілігі:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Назарды талап ететін терезелер уақыт өте жыпылықта_й береді"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Атып шығатын терез_елердің мөлдірлілігі:"
+msgid "_Accessibility"
+msgstr "Қ_олжетерлілік"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Жылж_ыту кезінде терезелердің мөлдірлілігі:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Жұмыс оры_ндарын ауыстыру үшін тышқан дөңгелегін қолдану"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Өл_шемін өзгерту кезінде терезелердің мөлдірлілігі:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Максималды терезелерді жы_лжытқан кезде өлшемдерін бастапқы мәнге келтіру"
+"_Пернетақтаның ыстық батырмаларымен ауысқан кезде\n"
+"алдыңғы жұмыс орнын есте сақтау және оған қайту"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Сыбайлас терезел_ердің көлеңкесін көрсету"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Ағы_мдағы жұмыс орынның орналасуына байланысты жұмыс орындарды ауыстыру"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Қалыпты _терезелердің көлеңкесін көрсету"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Бірінші не соңғ_ы жұмыс орнына жеткен кезде әрі қарай ауысу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Атып шығатын терезелердің _көлеңкесін көрсету"
+msgid "_Workspaces"
+msgstr "Жұм_ыс орындары"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Тере_зенің жұмыс орнына ауысу"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Ты_шқан курсорының астында"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Экран шеттердің кедергісін терезелер _жабысуының орнына қолдану"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Жұмыс оры_ндарын ауыстыру үшін тышқан дөңгелегін қолдану"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Ақылды орналастыруды қолдану үшін терезенің ең аз өлшемі:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Терезе өздігімен көтерілсе:"
+msgid "<i>Large</i>"
+msgstr "<i>Үлкен</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Жаңа терезелерді орналастыру:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Ағы_мдағы жұмыс орынның орналасуына байланысты жұмыс орындарды ауыстыру"
+msgid "At the _center of the screen"
+msgstr "Экран ор_тасында"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Бірінші не соңғ_ы жұмыс орнына жеткен кезде әрі қарай ауысу"
+msgid "Under the mouse _pointer"
+msgstr "Ты_шқан курсорының астында"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Қ_олжетерлілік"
+msgid "_Placement"
+msgstr "_Терезелердің орналасуы"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Т_ерезені ағымдағы жұмыс орнына апару"
+msgid "_Enable display compositing"
+msgstr "_Эффектерді іске қосу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "Ауы_су кезінде ерекшеленген терезеге қосымша қоршау салу"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Толық экран _оверлейдегі терезелерді тура көрсету"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Эффектерді іске қосу"
+msgid "Show shadows under _regular windows"
+msgstr "Қалыпты _терезелердің көлеңкесін көрсету"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Атып шығатын терезелердің _көлеңкесін көрсету"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Жасырын (қайырылған) терезелерді қоса"
+msgid "Show shadows under _dock windows"
+msgstr "Сыбайлас терезел_ердің көлеңкесін көрсету"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Ақылды орналастыруды қолдану үшін терезенің ең аз өлшемі:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Терезе қ_оршауының мөлдірлілігі:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Терезелердің орналасуы"
+msgid "<i>Transparent</i>"
+msgstr "<i>Мөлдір</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Тышқанның кез-кел_ген батырмасы басылған кезде терезені көтеру"
+msgid "<i>Opaque</i>"
+msgstr "<i>Мөлдір емес</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Пернетақтаның ыстық батырмаларымен ауысқан кезде\n"
-"алдыңғы жұмыс орнын есте сақтау және оған қайту"
+msgid "Opacity of _inactive windows:"
+msgstr "Белсенді емес терезелердің _ мөлдірлілігі:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Жылж_ыту кезінде терезелердің мөлдірлілігі:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"Ауыстырғышта көрсетпеу\" және \"есептер жолағында көрсетпеу\"\n"
-" қасиеттері орнатылған терезелерді аттап өту"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Өл_шемін өзгерту кезінде терезелердің мөлдірлілігі:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Атып шығатын терез_елердің мөлдірлілігі:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Жұм_ыс орындары"
+msgid "C_ompositor"
+msgstr "_Эффектер"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Өрістер</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Жұмыс оры_ндар саны:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Жұмыс орындары</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "А_ты:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Өрістер - бұл экран бұрыштарындағы аймақтар, оларға терезелер қойылмайды"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Жұмыс оры_ндар саны:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Өрістер</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -857,35 +867,35 @@ msgstr "Жұмыс оры_ндар саны:"
 msgid "%s (on %s)"
 msgstr "%s (%s орналасады)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Фонда орындау"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Фонда орындау (қолдау жоқ)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Композитинг режиміне өту"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Композитинг режиміне өту (қолдау жоқ)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Ағымдағы терезелер басқарушысын алмастыру"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Нұсқа ақпаратын шығару мен шығу"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[АРГУМЕНТТЕР...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Қолдану ақпаратын қарау үшін \"%s --help\" енгізіңіз."
@@ -1017,12 +1027,15 @@ msgstr "Ұрпақ үрдісінен мәліметтерді оқу қатес
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Сұхбат терезесін шақыру мүмкін емес: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Жұмыс орындарының нөмірлерін мен аттарын орнату"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Жұмыс орындары</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Жұмыс орынның атын ауыстыру"
 
-#~ msgid "_Name:"
-#~ msgstr "А_ты:"
-
 #~ msgid "Hide"
 #~ msgstr "Жасыру"
 
diff --git a/po/ko.po b/po/ko.po
index 4a954c3..d90a982 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
-"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2012-02-28 12:51+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-02-21 14:44+0900\n"
 "Last-Translator: Seong-ho, Cho <darkcircle.0426 at gmail.com>\n"
 "Language-Team: xfce-i18n <xfce-i18n at xfce.org>\n"
@@ -83,237 +83,237 @@ msgid "Settings manager socket"
 msgstr "관리자 소켓 설정"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "창 동작 및 바로 가기 설정"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "창 관리자"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "창 동작 및 효과 최적화"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "창 동작 및 바로 가기 설정"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "창 관리자 기능향상"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "작업공간의 수 및 이름 설정"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "창 동작 및 효과 최적화"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "작업공간"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>창 이동 및 크기 변경</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>단추 배치</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>두 번 누르기 동작(_A)</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>테마(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>창 활성 방법</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>제목 글꼴(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>새로운 창 활성화</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>창 제목 정렬(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>눌렀을 때 창 올리기</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "배치를 바꾸려면 단추을 누르고 끌어다 놓으십시오."
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>활성된 창 올리기</b>"
+msgid "Title"
+msgstr "제목"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>창 제목 정렬(_A)</b>"
+msgid "The window title cannot be removed"
+msgstr "창 제목은 제거할 수 없습니다"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>제목 글꼴(_T)</b>"
+msgid "Active"
+msgstr "활성화"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>창 바로 가기(_S)</b>"
+msgid "Menu"
+msgstr "메뉴"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>창 잡기</b>"
+msgid "Stick"
+msgstr "붙이기"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>작업공간 전환</b>"
+msgid "Shade"
+msgstr "말아올리기"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>테마(_T)</b>"
+msgid "Minimize"
+msgstr "최소화"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "최대화"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>길게</i>"
+msgid "Close"
+msgstr "닫기"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "숨김"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>짧게</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>단추 배치</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "모양새(_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>작게</i>"
+msgid "_Reset to Defaults"
+msgstr "기본값으로 재설정(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>창 바로 가기(_S)</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>넓게</i>"
+msgid "Ke_yboard"
+msgstr "키보드(_Y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "활성화"
+msgid "Clic_k to focus"
+msgstr "활성하기 위해 누름(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "고급 설정(_V)"
+msgid "Focus follows _mouse"
+msgstr "마우스를 따라가기(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "활성된 창을 자동으로 최상위로 올리기(_R)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "새로 만든 창을 자동으로 활성(_N)"
+msgid "_Delay before window receives focus:"
+msgstr "창 활성화 지연 시간(_D):"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "활성하기 위해 누름(_K)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "배치를 바꾸려면 단추을 누르고 끌어다 놓으십시오."
+msgid "<i>Short</i>"
+msgstr "<i>짧게</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "닫기"
+msgid "<i>Long</i>"
+msgstr "<i>길게</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>창 활성 방법</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "활성된 창을 올리기까지의 지연 시간(_B):"
+msgid "Automatically give focus to _newly created windows"
+msgstr "새로 만든 창을 자동으로 활성(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "거리(_T):"
+msgid "<b>New window focus</b>"
+msgstr "<b>새로운 창 활성화</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "마우스를 따라가기(_M)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "활성된 창을 자동으로 최상위로 올리기(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "숨김"
+msgid "Delay _before raising focused window:"
+msgstr "활성된 창을 올리기까지의 지연 시간(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "창을 움직일 때 내용 숨기기(_M)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>활성된 창 올리기</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "창 크기를 변경할 때 내용을 숨기기(_R)"
+msgid "Raise window when clicking _inside application window"
+msgstr "창 내부를 누르면 올림(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "키보드(_Y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>눌렀을 때 창 올리기</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "최대화"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "창 활성 방법(_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "메뉴"
+msgid "Snap windows to screen _border"
+msgstr "화면 경계에 따라 움직임(_B)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "최소화"
+msgid "Snap windows to other _windows"
+msgstr "다른 창에 맞추어 움직임(_W)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "창 내부를 누르면 올림(_I)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "말아올리기"
+msgid "Dis_tance:"
+msgstr "거리(_T):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "다른 창에 맞추어 움직임(_W)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "화면 경계에 따라 움직임(_B)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>작게</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "붙이기"
+msgid "<i>Wide</i>"
+msgstr "<i>넓게</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "제목표시줄을 두 번 눌렀을 때 수행하는 동작"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>창 잡기</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "창 제목은 제거할 수 없습니다"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "마우스 포인터가 화면 모서리에 닿으면 작업공간 전환(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "제목"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "창을 화면 밖으로 이동시키면 작업공간 전환(_D)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "화면 모서리 저항(_E):"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>작업공간 전환</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "마우스 포인터가 화면 모서리에 닿으면 작업공간 전환(_P)"
+msgid "Hide content of windows when _resizing"
+msgstr "창 크기를 변경할 때 내용을 숨기기(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "창 활성화 지연 시간(_D):"
+msgid "Hide content of windows when _moving"
+msgstr "창을 움직일 때 내용 숨기기(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "화면 모서리 저항(_E):"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>창 이동 및 크기 변경</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "창 활성 방법(_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "제목표시줄을 두 번 눌렀을 때 수행하는 동작"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "기본값으로 재설정(_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>두 번 누르기 동작(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "모양새(_S)"
+msgid "Ad_vanced"
+msgstr "고급 설정(_V)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -649,203 +649,212 @@ msgid ""
 "do this?"
 msgstr "이 행동은 모든 단축기를 기본값으로 되돌립니다. 정말로 실행하시렵니까?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>크게</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>불투명</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"페이저에 나타내지 않기\"나 \"태스크바에 나타내지 않기\"\n"
+"속성이 설정된 창 제외(_S)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "숨겨진(또는 아이콘화된) 창 포함(_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>투명</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "모든 작업공간의 창을 대상으로 순환(_T)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "창 활성 강탈 방지 활성화(_F)"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "순환하는 동안 선택한 창 주변으로 틀 그리기(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "화면 한 가운데(_C)"
+msgid "C_ycling"
+msgstr "창 순환(_Y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "기본적으로 위치할 창:"
+msgid "Activate _focus stealing prevention"
+msgstr "창 활성 강탈 방지 활성화(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "단축키 구성(_O)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "표준 ICCCM 포커스 힌트 수락(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "창 순환(_Y)"
+msgid "When a window raises itself:"
+msgstr "창이 위로 올라 올 때:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "모든 작업공간의 창을 대상으로 순환(_T)"
+msgid "_Bring window on current workspace"
+msgstr "창을 현재 작업공간으로 이동(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "직접 창을 도배해서 전체화면 표시(_F)"
+msgid "Switch to win_dow's workspace"
+msgstr "창의 작업공간으로 이동(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "아무 것도 안함(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "최대화된 창은 창틀을 숨기기(_F)"
+msgid "Key used to _grab and move windows:"
+msgstr "창을 잡고 움직이기 위한 키(_G):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "표준 ICCCM 포커스 힌트 수락(_S)"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "아무 마우스 단추이든 눌리면 창을 앞으로(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "응급 창의 반복적 깜빡임 유지(_B)"
+msgid "Hide _frame of windows when maximized"
+msgstr "최대화된 창은 창틀을 숨기기(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "창을 잡고 움직이기 위한 키(_G):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "최대화된 창을 움직일 때 원래 크기로(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "창의 장식을 깜빡여서 응급 상황임을 알림(_U)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "창 잡기 대신 모서리 저항을 사용(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "창 장식을 불투명으로(_T):"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "창의 장식을 깜빡여서 응급 상황임을 알림(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "비활성창을 불투명으로(_I):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "응급 창의 반복적 깜빡임 유지(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "팝업 창을 불투명으로(_S):"
+msgid "_Accessibility"
+msgstr "접근성(_A)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "창을 움직일 때 불투명으로(_M):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "데스크톱 상에서 마우스 휠을 돌려 작업공간 전환(_M)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "창 크기를 변경할 때 불투명으로(_Z):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "최대화된 창을 움직일 때 원래 크기로(_S)"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"바로 가기 키로 바꿀 때 이전 작업공간을\n"
+"호출하고 복원(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "붙이기 창에 그림자 표시(_D)"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "실제 데스크톱 배치에 따라 작업공간을 전환(_L)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "보통 창에 그림자 표시(_R)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "첫번째나 마지막 작업공간에 도달하면 작업공간 전환(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "팝업 창에 그림자 표시(_U)"
+msgid "_Workspaces"
+msgstr "작업공간(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "창의 작업공간으로 이동(_D)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "마우스 포인터 위치 시키기(_P)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "창 잡기 대신 모서리 저항을 사용(_E)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "데스크톱 상에서 마우스 휠을 돌려 작업공간 전환(_M)"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "똑똑한 배치를 적용할 창의 최소 크기(_M):"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "창이 위로 올라 올 때:"
+msgid "<i>Large</i>"
+msgstr "<i>크게</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "기본적으로 위치할 창:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "실제 데스크톱 배치에 따라 작업공간을 전환(_L)"
+msgid "At the _center of the screen"
+msgstr "화면 한 가운데(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "첫번째나 마지막 작업공간에 도달하면 작업공간 전환(_F)"
+msgid "Under the mouse _pointer"
+msgstr "마우스 포인터 위치 시키기(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "접근성(_A)"
+msgid "_Placement"
+msgstr "배치(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "창을 현재 작업공간으로 이동(_B)"
+msgid "_Enable display compositing"
+msgstr "디스플레이 합성 활성화(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "순환하는 동안 선택한 창 주변으로 틀 그리기(_D)"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "직접 창을 도배해서 전체화면 표시(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "디스플레이 합성 활성화(_E)"
+msgid "Show shadows under _regular windows"
+msgstr "보통 창에 그림자 표시(_R)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "팝업 창에 그림자 표시(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "숨겨진(또는 아이콘화된) 창 포함(_I)"
+msgid "Show shadows under _dock windows"
+msgstr "붙이기 창에 그림자 표시(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "똑똑한 배치를 적용할 창의 최소 크기(_M):"
+msgid "Opaci_ty of window decorations:"
+msgstr "창 장식을 불투명으로(_T):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "배치(_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>투명</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "아무 마우스 단추이든 눌리면 창을 앞으로(_R)"
+msgid "<i>Opaque</i>"
+msgstr "<i>불투명</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"바로 가기 키로 바꿀 때 이전 작업공간을\n"
-"호출하고 복원(_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "비활성창을 불투명으로(_I):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "창을 움직일 때 불투명으로(_M):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"페이저에 나타내지 않기\"나 \"태스크바에 나타내지 않기\"\n"
-"속성이 설정된 창 제외(_S)"
+msgid "Opacity of windows during resi_ze:"
+msgstr "창 크기를 변경할 때 불투명으로(_Z):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "팝업 창을 불투명으로(_S):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "작업공간(_W)"
+msgid "C_ompositor"
+msgstr "단축키 구성(_O)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>여백</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "작업공간의 수(_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>작업공간</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "여백은 창이 위치하지 않는 화면의 가장자리 영역입니다"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "작업공간의 수(_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>여백</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -853,35 +862,35 @@ msgstr "작업공간의 수(_N):"
 msgid "%s (on %s)"
 msgstr "%s (%s 에서)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "배경화면으로 쪼개기"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "배경화면으로 쪼개기 (지원하지 않음)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "합성처리 모드 설정"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "합성처리 모드 설정 (지원하지 않음)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "기존 창 관리자 바꾸기"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "버전 정보"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "사용법을 보려면 \"%s --help\"를 입력하십시오."
@@ -1012,3 +1021,9 @@ msgstr "자식 프로세스로부터 데이터를 읽는동안 오류가 발생
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "도우미 대화상자를 생성할 수 없습니다: %s\n"
+
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "작업공간의 수 및 이름 설정"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>작업공간</b>"
diff --git a/po/lt.po b/po/lt.po
index 1226c9d..c64faa2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the xfwm4 package.
 # Mantas Zapolskas <mantaz at users.sf.net>, 2003.
 # Algimantas Margevičius <margevicius.algimantas at gmail.com>, 2012.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 03:15+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-01-28 18:00+0200\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -83,237 +84,237 @@ msgid "Settings manager socket"
 msgstr "Nustatymų tvarkyklės lizdas"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfigūruoti lango elgseną ir susiejimus"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Langų tvarkyklė"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Konfigūruokite langų elgseną ir efektus"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfigūruoti lango elgseną ir susiejimus"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Langų tvarkyklės patobulinimai"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Nustatykite darbo vietų skaičių ir pavadinimus"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Konfigūruokite langų elgseną ir efektus"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Darbalaukiai"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Perkėlimas ir dydžio pakeitimas</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Mygtukų išdėstymas</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Veiksmas dukart _spragtelėjus</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokusavimo modelis</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Pavadinimo š_riftas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Naujo lango fokusavimas<b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Pavadinimo _lygiavimas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Iškelti paspaudus</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Paspauskite ir tempkite norėdami pakeisti išdėstymą"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Iškelti kai fokusuojama</b>"
+msgid "Title"
+msgstr "Pavadinimas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Pavadinimo _lygiavimas</b>"
+msgid "The window title cannot be removed"
+msgstr "Lango antraštė negali būti pašalinta"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Pavadinimo š_riftas</b>"
+msgid "Active"
+msgstr "Aktyvus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Lango _nuorodos</b>"
+msgid "Menu"
+msgstr "Meniu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Langų pritraukimas</b>"
+msgid "Stick"
+msgstr "Prisegti"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Laužyti darbo vietas</b>"
+msgid "Shade"
+msgstr "Šešėlis"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Suskleisti"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Išskleisti"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Ilgas</i>"
+msgid "Close"
+msgstr "Uždaryti"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Slepiamas"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Trumpas</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Mygtukų išdėstymas</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stilius"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Mažas</i>"
+msgid "_Reset to Defaults"
+msgstr "_Atstatyti į numatytąsias"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Lango _nuorodos</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Platus</i>"
+msgid "Ke_yboard"
+msgstr "_Klaviatūra"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktyvus"
+msgid "Clic_k to focus"
+msgstr "_Spauskite norėdami fokusuoti"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Iš_plėstas"
+msgid "Focus follows _mouse"
+msgstr "Dėmesys _sutelkiamas pagal pelės poziciją"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automatiškai iškelti _langus kai jie dėmesio centre"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automatiškai sutelkti _dėmesį į naujai sukurtus langus"
+msgid "_Delay before window receives focus:"
+msgstr "_Užlaikyti prieš iškeliant fokusuotą langą:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Spauskite norėdami fokusuoti"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Paspauskite ir tempkite norėdami pakeisti išdėstymą"
+msgid "<i>Short</i>"
+msgstr "<i>Trumpas</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Uždaryti"
+msgid "<i>Long</i>"
+msgstr "<i>Ilgas</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokusavimo modelis</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "_Užlaikyti prieš iškeliant fokusuotą langą:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automatiškai sutelkti _dėmesį į naujai sukurtus langus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Atstumas:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Naujo lango fokusavimas<b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Dėmesys _sutelkiamas pagal pelės poziciją"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automatiškai iškelti _langus kai jie dėmesio centre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Slepiamas"
+msgid "Delay _before raising focused window:"
+msgstr "_Užlaikyti prieš iškeliant fokusuotą langą:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Perkeliant langą slėpti jo _turinį"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Iškelti kai fokusuojama</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Keičiant lango dydį slėpti j_o turinį"
+msgid "Raise window when clicking _inside application window"
+msgstr "Iškelti langą kai _spaudžiama programos lango viduje"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Klaviatūra"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Iškelti paspaudus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Išskleisti"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokusavimas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Meniu"
+msgid "Snap windows to screen _border"
+msgstr "Užsklęsti langą į ekrano _kraštą"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Suskleisti"
+msgid "Snap windows to other _windows"
+msgstr "Pritraukti langus prie kitų _langų"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Iškelti langą kai _spaudžiama programos lango viduje"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Šešėlis"
+msgid "Dis_tance:"
+msgstr "_Atstumas:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Pritraukti langus prie kitų _langų"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Užsklęsti langą į ekrano _kraštą"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Mažas</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Prisegti"
+msgid "<i>Wide</i>"
+msgstr "<i>Platus</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Veiksmas kuris bus atliktas dukart spragtelėjus ant pavadinimo juostos"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Langų pritraukimas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Lango antraštė negali būti pašalinta"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "_Laužyti darbo vietas kai žymeklis pasiekia ekrano kraštą"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Pavadinimas"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Laužyti darbo vietas kai _tempiamas langas yra už ekrano"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Kraštų atsparumas :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Laužyti darbo vietas</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "_Laužyti darbo vietas kai žymeklis pasiekia ekrano kraštą"
+msgid "Hide content of windows when _resizing"
+msgstr "Keičiant lango dydį slėpti j_o turinį"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Užlaikyti prieš iškeliant fokusuotą langą:"
+msgid "Hide content of windows when _moving"
+msgstr "Perkeliant langą slėpti jo _turinį"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Kraštų atsparumas :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Perkėlimas ir dydžio pakeitimas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokusavimas"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Veiksmas kuris bus atliktas dukart spragtelėjus ant pavadinimo juostos"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Atstatyti į numatytąsias"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Veiksmas dukart _spragtelėjus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stilius"
+msgid "Ad_vanced"
+msgstr "Iš_plėstas"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -651,203 +652,212 @@ msgstr ""
 "Visi susiejimai bus atstatyti į jų numatytąsias reikšmes. Ar jūs tikrai to "
 "norite?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Didelis</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Matomumas</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Praleisti langus kurie turi „skip pager“\n"
+"arba „skip taskbar“ savybę"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Į_traukti paslėptus (t.y. neatpažintus) langus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Permatomumas</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Perjungti t_arp langų iš visų darbo laukų"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktyvuoti _fokuso pavogimo draudimą"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Perjunginėjant piešti rėmelį aplink langą"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Ekrano _centre"
+msgid "C_ycling"
+msgstr "_Perjungimas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Pagal nutylėjimą langus išdėstyti:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktyvuoti _fokuso pavogimo draudimą"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Kūrimas"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Garbingas _standartinis ICCCM fokuso patarimas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Perjungimas"
+msgid "When a window raises itself:"
+msgstr "Kai langas iškelia save:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Perjungti t_arp langų iš visų darbo laukų"
+msgid "_Bring window on current workspace"
+msgstr "_Atkelti langą į dabartinį darbastalį"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Rodyti _persidengiančius langus visame ekrane tiesiogiai"
+msgid "Switch to win_dow's workspace"
+msgstr "Perjungti į lango _darbo lauką"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Nieko nedaryti"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Išdidinus _slėpti lango rėmą"
+msgid "Key used to _grab and move windows:"
+msgstr "Klavišas langų _paėmimui ir perkėlimui:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Garbingas _standartinis ICCCM fokuso patarimas"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Iškelti langus paspaudus bet kurį pelės mygtuką"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Svarbius langus laikyti _pastoviai mirksinčius"
+msgid "Hide _frame of windows when maximized"
+msgstr "Išdidinus _slėpti lango rėmą"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Klavišas langų _paėmimui ir perkėlimui:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Perkeliant išdidintą langą atstatyti _originalų lango dydį"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Pranešti apie _lango svarbumą priverčiant mirksėti jo dekoracijas"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Vietoj lango karpymo naudoti _lango atsparumą"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "_Lango dekoracijų permatomumas:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Pranešti apie _lango svarbumą priverčiant mirksėti jo dekoracijas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "_Neaktyvių langų permatomumas:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Svarbius langus laikyti _pastoviai mirksinčius"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "_Iššokančių langų permatomumas:"
+msgid "_Accessibility"
+msgstr "_Prieinamumas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "_Perkeliamų langų permatomumas:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Perjungti darbo _laukams naudoti pelės ratuką darbalaukyje"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "_Keičiant lango dydį permatomumas:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Perkeliant išdidintą langą atstatyti _originalų lango dydį"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Prisiminti ir atkurti ankstesnį darbo lauką\n"
+"perjungiant klaviatūros susiejimais"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Aplink paslėptus langus _rodyti šešėlius"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Laužyti darbo laukus priklausomai nuo tikro darbalaukio _išdėstymo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Aplink įprastus langus _rodyti šešėlius"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Laužyti darbo vietas kai pasiekiama pirma a_rba paskutinė darbo vieta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Aplink iššokančius langus _rodyti šešėlius"
+msgid "_Workspaces"
+msgstr "_Darbo laukai"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Perjungti į lango _darbo lauką"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Po _pelės žymekliu"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Vietoj lango karpymo naudoti _lango atsparumą"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Perjungti darbo _laukams naudoti pelės ratuką darbalaukyje"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Mažiausias langas kuris iššauks talpų išdėstymą:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Kai langas iškelia save:"
+msgid "<i>Large</i>"
+msgstr "<i>Didelis</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Pagal nutylėjimą langus išdėstyti:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Laužyti darbo laukus priklausomai nuo tikro darbalaukio _išdėstymo"
+msgid "At the _center of the screen"
+msgstr "Ekrano _centre"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Laužyti darbo vietas kai pasiekiama pirma a_rba paskutinė darbo vieta"
+msgid "Under the mouse _pointer"
+msgstr "Po _pelės žymekliu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Prieinamumas"
+msgid "_Placement"
+msgstr "_Išdėstymas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Atkelti langą į dabartinį darbastalį"
+msgid "_Enable display compositing"
+msgstr "Į_jungti ekrano kompozicionavimą"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Perjunginėjant piešti rėmelį aplink langą"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Rodyti _persidengiančius langus visame ekrane tiesiogiai"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Į_jungti ekrano kompozicionavimą"
+msgid "Show shadows under _regular windows"
+msgstr "Aplink įprastus langus _rodyti šešėlius"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Aplink iššokančius langus _rodyti šešėlius"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Į_traukti paslėptus (t.y. neatpažintus) langus"
+msgid "Show shadows under _dock windows"
+msgstr "Aplink paslėptus langus _rodyti šešėlius"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Mažiausias langas kuris iššauks talpų išdėstymą:"
+msgid "Opaci_ty of window decorations:"
+msgstr "_Lango dekoracijų permatomumas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Išdėstymas"
+msgid "<i>Transparent</i>"
+msgstr "<i>Permatomumas</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Iškelti langus paspaudus bet kurį pelės mygtuką"
+msgid "<i>Opaque</i>"
+msgstr "<i>Matomumas</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Prisiminti ir atkurti ankstesnį darbo lauką\n"
-"perjungiant klaviatūros susiejimais"
+msgid "Opacity of _inactive windows:"
+msgstr "_Neaktyvių langų permatomumas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "_Perkeliamų langų permatomumas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Praleisti langus kurie turi „skip pager“\n"
-"arba „skip taskbar“ savybę"
+msgid "Opacity of windows during resi_ze:"
+msgstr "_Keičiant lango dydį permatomumas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "_Iššokančių langų permatomumas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Darbo laukai"
+msgid "C_ompositor"
+msgstr "_Kūrimas"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Paraštės</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Darbo vietų skaičius:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Darbo vietos</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Paraštės yra ekrano kraštų vietos, kuriose langai negali būti padėti"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Darbo vietų skaičius:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Paraštės</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -855,35 +865,35 @@ msgstr "_Darbo vietų skaičius:"
 msgid "%s (on %s)"
 msgstr "%s (ant %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Prijungti prie fono"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Prijungti prie fono (nepalaikoma)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Nustatyti kompozicionavimo režimą"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Nustatyti kompozicionavimo režimą (nepalaikoma)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Pakeisti dabartinę langų tvarkyklę"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Parodyti versiją ir išeiti"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTAI...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Naudojimui įrašykite „%s --help“."
@@ -1014,3 +1024,9 @@ msgstr "Klaida skaitant iš antrinio proceso: %s\n"
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nepavyko sukurti pagalbos dialogo: %s\n"
+
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Nustatykite darbo vietų skaičių ir pavadinimus"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Darbo vietos</b>"
diff --git a/po/lv.po b/po/lv.po
index 9d4727c..5048730 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-01-30 12:53-0000\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
@@ -90,242 +90,242 @@ msgid "Settings manager socket"
 msgstr "Uzstādījumu pārvaldnieka sokets"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfigurēt loga uzvedību un īsceļus"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Logu pārvaldnieks"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Noskaņot logu uzvedību un efektus"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfigurēt loga uzvedību un īsceļus"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Logu pārvaldnieka piedares"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Uzstādīt darbavietu skaitu un nosaukumus"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Noskaņot logu uzvedību un efektus"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Darbavietas"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Kastes pārvietošana un izmēru maiņa</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Pogu izkārtojums</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dubultklikšķa _darbība</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tēma</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokusa modelis</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Virsraks_ta fonts</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Jauna loga fokuss</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Virsraksta _novietojums</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Celt uz klikšķi</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Uzklikšķiniet un velciet pogas, lai mainītu izkārtojumu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Pacelt pie fokusa</b>"
+msgid "Title"
+msgstr "Virsraksts"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Virsraksta _novietojums</b>"
+msgid "The window title cannot be removed"
+msgstr "Loga virsraksts nav noņemams"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Virsraks_ta fonts</b>"
+msgid "Active"
+msgstr "Aktīvs"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Loga ī_sceļi</b>"
+msgid "Menu"
+msgstr "Izvēlne"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Logu piesaiste</b>"
+msgid "Stick"
+msgstr "Pielipināt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Apliekt darbavietu</b>"
+msgid "Shade"
+msgstr "Saritināt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tēma</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "M_inimizēt"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimizēt"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Aizture|<i>Gara</i>"
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Slēpts"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
-msgid "<i>Short</i>"
-msgstr "Aizture|<i>Īsa</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Pogu izkārtojums</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stils"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-#, fuzzy
-msgid "<i>Small</i>"
-msgstr "Izmērs|<i>Mazs</i>"
+msgid "_Reset to Defaults"
+msgstr "_Atstatīt uz noklusētajiem"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Loga ī_sceļi</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Attālums|<i>Plats</i>"
+msgid "Ke_yboard"
+msgstr "Kla_viatūra"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktīvs"
+msgid "Clic_k to focus"
+msgstr "_Klikšķis fokusē"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Paplašināti"
+msgid "Focus follows _mouse"
+msgstr "Fokus sek_o pelei"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automātiski _pacelt logus, kad tie saņem fokusu"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automātiski sniegt fokusu _jaunizveidotam logam"
+msgid "_Delay before window receives focus:"
+msgstr "_Aizkavēt, pirms logs saņem fokusu:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Klikšķis fokusē"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Uzklikšķiniet un velciet pogas, lai mainītu izkārtojumu"
+#, fuzzy
+msgid "<i>Short</i>"
+msgstr "Aizture|<i>Īsa</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Aizvērt"
+#, fuzzy
+msgid "<i>Long</i>"
+msgstr "Aizture|<i>Gara</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokusa modelis</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Aizkave, _pirms celt fokusētos logus:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automātiski sniegt fokusu _jaunizveidotam logam"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Attālums:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Jauna loga fokuss</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus sek_o pelei"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automātiski _pacelt logus, kad tie saņem fokusu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Slēpts"
+msgid "Delay _before raising focused window:"
+msgstr "Aizkave, _pirms celt fokusētos logus:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Slēpt lo_ga saturu pie pārvietošanas"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Pacelt pie fokusa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Slēpt _loga saturu pie izmēru maiņas"
+msgid "Raise window when clicking _inside application window"
+msgstr "Pacelt logu, ka_d lietotnes logā ir ieklikšķināts "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Kla_viatūra"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Celt uz klikšķi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimizēt"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokuss"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Izvēlne"
+msgid "Snap windows to screen _border"
+msgstr "Piesaistīt logus ekrāna _malām"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "M_inimizēt"
+msgid "Snap windows to other _windows"
+msgstr "Piesaistīt l_ogus citiem logiem"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Pacelt logu, ka_d lietotnes logā ir ieklikšķināts "
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Saritināt"
+msgid "Dis_tance:"
+msgstr "_Attālums:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Piesaistīt l_ogus citiem logiem"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Piesaistīt logus ekrāna _malām"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#, fuzzy
+msgid "<i>Small</i>"
+msgstr "Izmērs|<i>Mazs</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Pielipināt"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Attālums|<i>Plats</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Veicamā darbība pēc dubultklikšķa uz virsrakstu joslas"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Logu piesaiste</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Loga virsraksts nav noņemams"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Apliekt darbavietu, kad _kursors sasniedz ekrāna malu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Virsraksts"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Apliekt darbavietu, kad _velk logu nost no ekrāna"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Malu pretestība :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Apliekt darbavietu</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Apliekt darbavietu, kad _kursors sasniedz ekrāna malu"
+msgid "Hide content of windows when _resizing"
+msgstr "Slēpt _loga saturu pie izmēru maiņas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Aizkavēt, pirms logs saņem fokusu:"
+msgid "Hide content of windows when _moving"
+msgstr "Slēpt lo_ga saturu pie pārvietošanas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Malu pretestība :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Kastes pārvietošana un izmēru maiņa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokuss"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Veicamā darbība pēc dubultklikšķa uz virsrakstu joslas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Atstatīt uz noklusētajiem"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dubultklikšķa _darbība</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stils"
+msgid "Ad_vanced"
+msgstr "_Paplašināti"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -667,204 +667,214 @@ msgid ""
 msgstr ""
 "Šis atstatīs visus īsceļus uz noklusētajām vērtībām. Vai vēlaties turpināt?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
-msgid "<i>Large</i>"
-msgstr "Izmērs|<i>Liels</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Necaurspīdīgs</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"I_zlaist logus, kuriem ir uzstādītas īpašības\n"
+"\"izlaist peidžeri\" vai \"izlaist uzdevumjoslu\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Iekļaut slēptos logus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Caurspīdīgs</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Ciklēt cauri visiem logiem no visām darbavietām"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktivizēt _fokusa zagšanas novēršanu"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Zīmēt rāmi apkārt atlasītajam logam, kamēr ciklo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Ekrāna _centrā"
+msgid "C_ycling"
+msgstr "Ci_klošana"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Pēc noklusētā, logus novietot:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktivizēt _fokusa zagšanas novēršanu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_omponists"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Ievērot ICCM _standarta fokusa ieteikumu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Ci_klošana"
+msgid "When a window raises itself:"
+msgstr "Kad logs paceļ sevi:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Ciklēt cauri visiem logiem no visām darbavietām"
+msgid "_Bring window on current workspace"
+msgstr "_Novietot logu uz esošās darbavietas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Rādīt _tieši pilna ekrāna pārklājuma logus"
+msgid "Switch to win_dow's workspace"
+msgstr "Pārslē_gties uz loga darbavietu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Darīt _neko"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Kad maksimizēts, slēpt loga _rāmi"
+msgid "Key used to _grab and move windows:"
+msgstr "_Taustiņš, ar kuru paķert un pārvietot logu:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Ievērot ICCM _standarta fokusa ieteikumu"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Pacelt logu, kad nospiest jebkurš peles taustiņš"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Steidzamos logus _mirkšķināt nepārtraukti"
+msgid "Hide _frame of windows when maximized"
+msgstr "Kad maksimizēts, slēpt loga _rāmi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "_Taustiņš, ar kuru paķert un pārvietot logu:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Atgriezt sākotnējo i_zmēru, kad logs tiek pārvietots"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Ziņot par _steidzamību mirkšķinot loga dekorāciju"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Izm_antot malu pretestību, nevis logu piesaisti"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Loga dekorāci_ju necaurspīdība:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Ziņot par _steidzamību mirkšķinot loga dekorāciju"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Necaurspīdība _neaktīvam logam:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Steidzamos logus _mirkšķināt nepārtraukti"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "I_zlecošo logu necaurspīdība:"
+msgid "_Accessibility"
+msgstr "_Pieejamība"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Nec_aurspīdība loga pārvietošanas brīdī:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Izmantot peles _ritentiņu, lai pārslēgtos starp darbavietām"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Necaurspīdība loga iz_mēru maiņas brīdī:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Atgriezt sākotnējo i_zmēru, kad logs tiek pārvietots"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Atcerēties un atsaukt iepriekšējo darbavietu,\n"
+"kad pārslēdzas ar klaviatūras īsinājumtaustiņiem"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Rādīt ēnas zem loga _doka"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Apliekt darbavietas balstoties uz esošo darbvirsmas i_zkārtojumu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Rādīt ēnas zem _parastiem logiem"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Apliekt _darbavietu, kad pirmā vai pēdējā darbavieta ir sasniegta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Rādīt ēnas ze_m izlecošajiem logiem"
+msgid "_Workspaces"
+msgstr "_Darbavietas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Pārslē_gties uz loga darbavietu"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Zem _peles kursora"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Izm_antot malu pretestību, nevis logu piesaisti"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Izmantot peles _ritentiņu, lai pārslēgtos starp darbavietām"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minimālais loga izmērs, lai palaistu gudro novietošanu:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Kad logs paceļ sevi:"
+#, fuzzy
+msgid "<i>Large</i>"
+msgstr "Izmērs|<i>Liels</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Pēc noklusētā, logus novietot:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Apliekt darbavietas balstoties uz esošo darbvirsmas i_zkārtojumu"
+msgid "At the _center of the screen"
+msgstr "Ekrāna _centrā"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Apliekt _darbavietu, kad pirmā vai pēdējā darbavieta ir sasniegta"
+msgid "Under the mouse _pointer"
+msgstr "Zem _peles kursora"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Pieejamība"
+msgid "_Placement"
+msgstr "_Novietojums"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Novietot logu uz esošās darbavietas"
+msgid "_Enable display compositing"
+msgstr "Iespējot attēlošanas _kompozīciju"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Zīmēt rāmi apkārt atlasītajam logam, kamēr ciklo"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Rādīt _tieši pilna ekrāna pārklājuma logus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Iespējot attēlošanas _kompozīciju"
+msgid "Show shadows under _regular windows"
+msgstr "Rādīt ēnas zem _parastiem logiem"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Rādīt ēnas ze_m izlecošajiem logiem"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Iekļaut slēptos logus"
+msgid "Show shadows under _dock windows"
+msgstr "Rādīt ēnas zem loga _doka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minimālais loga izmērs, lai palaistu gudro novietošanu:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Loga dekorāci_ju necaurspīdība:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Novietojums"
+msgid "<i>Transparent</i>"
+msgstr "<i>Caurspīdīgs</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Pacelt logu, kad nospiest jebkurš peles taustiņš"
+msgid "<i>Opaque</i>"
+msgstr "<i>Necaurspīdīgs</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Atcerēties un atsaukt iepriekšējo darbavietu,\n"
-"kad pārslēdzas ar klaviatūras īsinājumtaustiņiem"
+msgid "Opacity of _inactive windows:"
+msgstr "Necaurspīdība _neaktīvam logam:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Nec_aurspīdība loga pārvietošanas brīdī:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"I_zlaist logus, kuriem ir uzstādītas īpašības\n"
-"\"izlaist peidžeri\" vai \"izlaist uzdevumjoslu\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Necaurspīdība loga iz_mēru maiņas brīdī:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "I_zlecošo logu necaurspīdība:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Darbavietas"
+msgid "C_ompositor"
+msgstr "K_omponists"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Apmales</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Darbavietu _skaits:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Darbavieta</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nosaukums:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Apmales, ir ekrāna daļa, kur logi netiks novietoti"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Darbavietu _skaits:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Apmales"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -872,37 +882,37 @@ msgstr "Darbavietu _skaits:"
 msgid "%s (on %s)"
 msgstr "%s (uz %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Xfce 4 logu pārvaldnieka uzstādījumi"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "Versijas informācija"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1034,6 +1044,15 @@ msgstr "Kļūda lasot datus no bērna procesa: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nevar izveidot helper-dialog:%s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Uzstādīt darbavietu skaitu un nosaukumus"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Apmales</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Darbavieta</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Mainīt darbavietas nosaukumu"
 
@@ -1254,10 +1273,6 @@ msgstr "Nevar izveidot helper-dialog:%s\n"
 #~ msgid "Change name"
 #~ msgstr "Mainīt nosaukumu"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nosaukums:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Uzklikšķiniet uz darbavietas, lai rediģētu nosaukumu"
 
@@ -1275,10 +1290,6 @@ msgstr "Nevar izveidot helper-dialog:%s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Darbavietas un apmales"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Apmales"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Loga pārvaldnieka uzstādījumi"
 
diff --git a/po/mk.po b/po/mk.po
index 3e85901..14f864c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-12-24 03:21+0100\n"
 "Last-Translator: Jovan Naumovski <jovan at lugola.net>\n"
 "Language-Team: Macedonian <mkde-l10n at lists.sourceforge.net>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,283 +79,282 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Прекини го дејството на прозорецот"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Менаџер за прозорци"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Прекини го дејството на прозорецот"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Подобрувања на менаџерот за прозорци"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Број на работни површини:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Прекини го дејството на прозорецот"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Работни површи"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Провидност при движење и промена на големина"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Изглед на копчињата"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Дејство при двоен клик"
+msgid "<b>_Theme</b>"
+msgstr "Поставување на насловот"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Модел на фокус"
+msgid "<b>Title fon_t</b>"
+msgstr "Фонт за наслов "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Фокус на новите прозорци"
+msgid "<b>Title _alignment</b>"
+msgstr "Поставување на насловот"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Подигни при клик"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Кликнете и влечете ги копчињата за да го промените изгледот"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Подигни при фокус"
+msgid "Title"
+msgstr "Наслов"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Поставување на насловот"
+msgid "The window title cannot be removed"
+msgstr "Насловот на прозорецот, не може да се отстрани"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Фонт за наслов "
+msgid "Active"
+msgstr "Активно"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Кратенки на прозорец"
+msgid "Menu"
+msgstr "Мени"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Лепење на прозорците"
+msgid "Stick"
+msgstr "Прилепи"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Преминувај преку работните површини"
+msgid "Shade"
+msgstr "Сенка"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Поставување на насловот"
+msgid "Minimize"
+msgstr "Ма_ксимизирај"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Максимизирај"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Големо"
+msgid "Close"
+msgstr "Затвори"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Скриен"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "Транспарентност"
+msgid "<b>Button layout</b>"
+msgstr "Изглед на копчињата"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Стил"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Мало"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Кратенки на прозорец"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Широко"
+msgid "Ke_yboard"
+msgstr "Тастатура"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Активно"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Кликнете за фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Напредно"
+msgid "Focus follows _mouse"
+msgstr "Фокусот го следи глувчето"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Автоматски подигнувај ги прозорците кога добиваат фокус"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Автоматски додели фокус на новокреираните прозорци"
+msgid "_Delay before window receives focus:"
+msgstr "Задоцнување пред подигнување на фокусираниот прозорец :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "Кликнете за фокус"
+msgid "<i>Short</i>"
+msgstr "Транспарентност"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Кликнете и влечете ги копчињата за да го промените изгледот"
+msgid "<i>Long</i>"
+msgstr "Големо"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Затвори"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Модел на фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Задоцнување пред подигнување на фокусираниот прозорец :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Автоматски додели фокус на новокреираните прозорци"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Растојание :"
+msgid "<b>New window focus</b>"
+msgstr "Фокус на новите прозорци"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Фокусот го следи глувчето"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Автоматски подигнувај ги прозорците кога добиваат фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Скриен"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Задоцнување пред подигнување на фокусираниот прозорец :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Прикажи ја содржината на прозорецот при поместување"
+msgid "<b>Raise on focus</b>"
+msgstr "Подигни при фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Прикажи ја содржината на прозорецот при промена на големината"
+msgid "Raise window when clicking _inside application window"
+msgstr "Подигни ги прозорците при кликнување во прозорецот ан апликацијата"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Тастатура"
+msgid "<b>Raise on click</b>"
+msgstr "Подигни при клик"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Максимизирај"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Мени"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Прилепувај ги прозорците на работ на екранот"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Ма_ксимизирај"
+msgid "Snap windows to other _windows"
+msgstr "Прилепувај ги прозорците на другите прозорци"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Подигни ги прозорците при кликнување во прозорецот ан апликацијата"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Сенка"
+msgid "Dis_tance:"
+msgstr "Растојание :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Прилепувај ги прозорците на другите прозорци"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Прилепувај ги прозорците на работ на екранот"
+msgid "<i>Small</i>"
+msgstr "Мало"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Прилепи"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Широко"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Дејство за извршување при двоен клик на полето со наслов :"
+msgid "<b>Windows snapping</b>"
+msgstr "Лепење на прозорците"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "Насловот на прозорецот, не може да се отстрани"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Преминувај преку работните површини кога стрелката го достигнува работ на "
+"екранот"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Наслов"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Преминувај преку работните површини при влечење на прозорец преку екранот"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Отпор на ќошевите :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Преминувај преку работните површини"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Преминувај преку работните површини кога стрелката го достигнува работ на "
-"екранот"
+msgid "Hide content of windows when _resizing"
+msgstr "Прикажи ја содржината на прозорецот при промена на големината"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Задоцнување пред подигнување на фокусираниот прозорец :"
+msgid "Hide content of windows when _moving"
+msgstr "Прикажи ја содржината на прозорецот при поместување"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Отпор на ќошевите :"
+msgid "<b>Box move and resize</b>"
+msgstr "Провидност при движење и промена на големина"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Фокус"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Дејство за извршување при двоен клик на полето со наслов :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Дејство при двоен клик"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Стил"
+msgid "Ad_vanced"
+msgstr "Напредно"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -732,54 +731,57 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "Големо"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Прескокни ги прозорците кај кои е поставено својството \"прескокни пејџер\" "
+"или \"прескокни лента со задачи\""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "Провидност"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Вклучувај ги и скриените (т.е. иконизирани) прозорци"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "Транспарентност"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Кружи низ прозорците од сите работни површини"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "Активирај превенција од крадење на фокусот"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "Кружење"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "Активирај превенција од крадење на фокусот"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Композитор"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Користи го стандардниот ICCCM фокус"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "Кружење"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "Кружи низ прозорците од сите работни површини"
+msgid "_Bring window on current workspace"
+msgstr "Помести го прозорецот во следната работна површина"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Прикажи ги прозорците на цел екран директно"
+msgid "Switch to win_dow's workspace"
+msgstr "Премести го прозорецот до работната површина %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -788,193 +790,198 @@ msgstr "Ништо"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "Криј ја рамката на прозорците кога се максимизирани"
+msgid "Key used to _grab and move windows:"
+msgstr "Копчињата користени за фаќање и поместување на прозорците"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Користи го стандардниот ICCCM фокус"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Подигни ги прозорците кога било кое копче од глувчето е притиснато"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "Криј ја рамката на прозорците кога се максимизирани"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "Копчињата користени за фаќање и поместување на прозорците"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Врати ја оригиналната големина на максимизираните прозорци кога се "
+"поместуваат"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Користи отпор на ќошевите, наместо прилепување на прозорците"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Провидност на декорацијата на прозорците"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Провидност на неактивните прозорци"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Провидност на скокачките прозорци"
+msgid "_Accessibility"
+msgstr "Пристапност"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Провидност на на прозорците при поместување"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Провидност на прозорците при промена на големината"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Врати ја оригиналната големина на максимизираните прозорци кога се "
-"поместуваат"
+"Запомни ги и врати ја претходната работна површина при преминување со "
+"кратенки на тастатурата"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "Прикажи сенки под скокачките прозорци"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Преминувај преку работните површини, во зависност од изгледот на тековната "
+"работна површина"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "Прикажи сенки под обичните прозорци"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Преминувај меѓу работните површини кога првата или последната работна "
+"површина е достигната"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "Прикажи сенки под скокачките прозорци"
+msgid "_Workspaces"
+msgstr "Работни површи"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Премести го прозорецот до работната површина %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Минимална големина на прозорците за да се пушти паметното поставување"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Користи отпор на ќошевите, наместо прилепување на прозорците"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "Големо"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
-"Преминувај преку работните површини, во зависност од изгледот на тековната "
-"работна површина"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
-"Преминувај меѓу работните површини кога првата или последната работна "
-"површина е достигната"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "Пристапност"
+msgid "_Placement"
+msgstr "Поставување"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Помести го прозорецот во следната работна површина"
+msgid "_Enable display compositing"
+msgstr "Овозможи го прелевањето"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Прикажи ги прозорците на цел екран директно"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "Овозможи го прелевањето"
+msgid "Show shadows under _regular windows"
+msgstr "Прикажи сенки под обичните прозорци"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "Прикажи сенки под скокачките прозорци"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Вклучувај ги и скриените (т.е. иконизирани) прозорци"
+msgid "Show shadows under _dock windows"
+msgstr "Прикажи сенки под скокачките прозорци"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Минимална големина на прозорците за да се пушти паметното поставување"
+msgid "Opaci_ty of window decorations:"
+msgstr "Провидност на декорацијата на прозорците"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "Поставување"
+msgid "<i>Transparent</i>"
+msgstr "Транспарентност"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Подигни ги прозорците кога било кое копче од глувчето е притиснато"
+msgid "<i>Opaque</i>"
+msgstr "Провидност"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Запомни ги и врати ја претходната работна површина при преминување со "
-"кратенки на тастатурата"
+msgid "Opacity of _inactive windows:"
+msgstr "Провидност на неактивните прозорци"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Провидност на на прозорците при поместување"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Прескокни ги прозорците кај кои е поставено својството \"прескокни пејџер\" "
-"или \"прескокни лента со задачи\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Провидност на прозорците при промена на големината"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Провидност на скокачките прозорци"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Работни површи"
+msgid "C_ompositor"
+msgstr "Композитор"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Маргини"
+msgid "_Number of workspaces:"
+msgstr "Број на работни површини:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Преминувај преку работните површини"
+msgid "Names"
+msgstr "Име:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Маргините се површина на краевите на екранот каде не може да се постави "
 "прозорец"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Број на работни површини:"
+msgid "_Margins"
+msgstr "Маргини"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -982,36 +989,36 @@ msgstr "Број на работни површини:"
 msgid "%s (on %s)"
 msgstr "%s (на %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Поставувања на менаџерот на прозорци на Xfce 4"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1155,6 +1162,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Број на работни површини:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Маргини"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Преминувај преку работните површини"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Имиња на работните површини"
 
@@ -1380,16 +1399,12 @@ msgstr ""
 
 #~ msgid "These settings cannot work with your current window manager (%s)"
 #~ msgstr ""
-#~ "Овие поставувања нема да работат со Вашиот тековен менаџер на прозорци (%"
-#~ "s)"
+#~ "Овие поставувања нема да работат со Вашиот тековен менаџер на прозорци "
+#~ "(%s)"
 
 #~ msgid "Change name"
 #~ msgstr "Промени го името"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Име:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Кликнете на името на работниот простор за да го промените"
 
@@ -1407,10 +1422,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Работни површини и маргини"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Маргини"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Поставувања за менаџерот на прозорци"
 
diff --git a/po/mr.po b/po/mr.po
index 48e0d63..dffcf0b 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:48+0900\n"
 "Last-Translator: Pallavi Nikam <pallavi_edu at rediffmail.com>\n"
 "Language-Team: Marathi <LL at li.org>\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mr\n"
 "X-Generator: KBabel 1.9\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -79,279 +79,278 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "विण्डो व्यवस्थापक"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "विण्डो व्यवस्थापक"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "कार्यक्षेत्रांची संख्या:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "कार्यक्षेत्रे"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "अपारदर्शी हलवा आणि पुन:आकारित करा"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "बटन स्वरुप"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "दोनदा क्लिक करण्याची क्रिया"
+msgid "<b>_Theme</b>"
+msgstr "शीर्षक मांडणी"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "फोकस मॉडेल"
+msgid "<b>Title fon_t</b>"
+msgstr "शीर्षक फॉन्ट"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "नविन विण्डो फोकस"
+msgid "<b>Title _alignment</b>"
+msgstr "शीर्षक मांडणी"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "क्लिक वर उचला"
+msgid "Click and drag the buttons to change the layout"
+msgstr "स्वरुप बदलण्याहेतू क्लिक आणि ओढणेची बटनस "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "फोकस वर उचलने"
+msgid "Title"
+msgstr "शीर्षक"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "शीर्षक मांडणी"
+msgid "The window title cannot be removed"
+msgstr "विण्डोचे शीर्षक काढूण टाकू शकत नाही"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "शीर्षक फॉन्ट"
+msgid "Active"
+msgstr "क्रियाशील"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "विण्डो शॉर्टकटस"
+msgid "Menu"
+msgstr "यादी"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "विण्डो स्नॅपिंग"
+msgid "Stick"
+msgstr "चिटकवा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "कार्यक्षेत्रास आच्छादित करा"
+msgid "Shade"
+msgstr "छाया"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "शीर्षक मांडणी"
+msgid "Minimize"
+msgstr "विस्तीर्ण (_x)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "विस्तीर्ण"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "बंद"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "लुप्त"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "बटन स्वरुप"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "शैली"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "लहान"
+msgid "<b>Window _shortcuts</b>"
+msgstr "विण्डो शॉर्टकटस"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "अंतर:"
+msgid "Ke_yboard"
+msgstr "कीबोर्ड"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "क्रियाशील"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "फोकस वर क्लिक करा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "आधुनिक"
+msgid "Focus follows _mouse"
+msgstr "फोकस माउसच्या मागे असतो"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "आपोआप विण्डो उचलतो जेव्हा त्यांना फोकस मिळतोंतर "
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "नविन निर्माण केलेल्या विण्डोजला आपोआप फोकस देतो"
+msgid "_Delay before window receives focus:"
+msgstr "फोकसड विण्डो उचलण्याआधी उशीर:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "फोकस वर क्लिक करा"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "स्वरुप बदलण्याहेतू क्लिक आणि ओढणेची बटनस "
+msgid "<i>Short</i>"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "बंद"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "फोकस मॉडेल"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "फोकसड विण्डो उचलण्याआधी उशीर:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "नविन निर्माण केलेल्या विण्डोजला आपोआप फोकस देतो"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "अंतर:"
+msgid "<b>New window focus</b>"
+msgstr "नविन विण्डो फोकस"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "फोकस माउसच्या मागे असतो"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "आपोआप विण्डो उचलतो जेव्हा त्यांना फोकस मिळतोंतर "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "लुप्त"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "फोकसड विण्डो उचलण्याआधी उशीर:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "हलविताना विण्डोचे आशय दाखवा "
+msgid "<b>Raise on focus</b>"
+msgstr "फोकस वर उचलने"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
+msgid "Raise window when clicking _inside application window"
+msgstr "एप्लिकेशन विण्डोमध्ये क्लिक करताना विण्डो उचला"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "कीबोर्ड"
+msgid "<b>Raise on click</b>"
+msgstr "क्लिक वर उचला"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "विस्तीर्ण"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "फोकस"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "यादी"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "स्क्रीन बॉर्डरला विण्डोजमध्ये स्नॅप कराा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "विस्तीर्ण (_x)"
+msgid "Snap windows to other _windows"
+msgstr "बाकीच्या विण्डोजमध्ये या विण्डोजला स्नॅप करा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "एप्लिकेशन विण्डोमध्ये क्लिक करताना विण्डो उचला"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "छाया"
+msgid "Dis_tance:"
+msgstr "अंतर:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "बाकीच्या विण्डोजमध्ये या विण्डोजला स्नॅप करा"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "स्क्रीन बॉर्डरला विण्डोजमध्ये स्नॅप कराा"
+msgid "<i>Small</i>"
+msgstr "लहान"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "चिटकवा"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "अंतर:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "शीर्शक दांड्यावर दोनदा क्लिक करताना होणारीि क्रिया:"
+msgid "<b>Windows snapping</b>"
+msgstr "विण्डो स्नॅपिंग"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "विण्डोचे शीर्षक काढूण टाकू शकत नाही"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "पॉइंटर पडद्याच्या कडेला पोहोचल्यावर कार्यक्षेत्रांना आच्छादित करा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "शीर्षक"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "विण्डोला पडद्याबाहेर खेचताना कार्यक्षेत्रांना आच्छादित करा"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "किनार प्रतिरोध:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "कार्यक्षेत्रास आच्छादित करा"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "पॉइंटर पडद्याच्या कडेला पोहोचल्यावर कार्यक्षेत्रांना आच्छादित करा"
+msgid "Hide content of windows when _resizing"
+msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "फोकसड विण्डो उचलण्याआधी उशीर:"
+msgid "Hide content of windows when _moving"
+msgstr "हलविताना विण्डोचे आशय दाखवा "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "किनार प्रतिरोध:"
+msgid "<b>Box move and resize</b>"
+msgstr "अपारदर्शी हलवा आणि पुन:आकारित करा"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "फोकस"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "शीर्शक दांड्यावर दोनदा क्लिक करताना होणारीि क्रिया:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "दोनदा क्लिक करण्याची क्रिया"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "शैली"
+msgid "Ad_vanced"
+msgstr "आधुनिक"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -730,48 +729,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "विण्डो डाव्या कार्यक्षेत्रामध्ये हलवा"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "शॉर्टकट निर्मिती"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "विण्डो डाव्या कार्यक्षेत्रामध्ये हलवा"
+msgid "_Bring window on current workspace"
+msgstr "विण्डो पूढील कार्यक्षेत्रामध्ये हलवा"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "विण्डो कार्यक्षेत्र १ मध्ये हलवा"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -779,166 +780,172 @@ msgid "Do _nothing"
 msgstr "काहिहि नाही"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "हलविताना विण्डोचे आशय दाखवा "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "हलविताना विण्डोचे आशय दाखवा "
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "हलविताना विण्डोचे आशय दाखवा "
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "हलविताना विण्डोचे आशय दाखवा "
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "हलविताना विण्डोचे आशय दाखवा "
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "पॉइंटर पडद्याच्या कडेला पोहोचल्यावर कार्यक्षेत्रांना आच्छादित करा"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "विण्डो कार्यक्षेत्र १ मध्ये हलवा"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "कार्यक्षेत्रे"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "पॉइंटर पडद्याच्या कडेला पोहोचल्यावर कार्यक्षेत्रांना आच्छादित करा"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "विण्डो पूढील कार्यक्षेत्रामध्ये हलवा"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "हलविताना विण्डोचे आशय दाखवा "
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "हलविताना विण्डोचे आशय दाखवा "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "पुन:आकारित करताना विण्डोचे आशय दाखवा"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "हलविताना विण्डोचे आशय दाखवा "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "कार्यक्षेत्रे"
+msgid "C_ompositor"
+msgstr "शॉर्टकट निर्मिती"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "समास"
+msgid "_Number of workspaces:"
+msgstr "कार्यक्षेत्रांची संख्या:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "कार्यक्षेत्रास आच्छादित करा"
+msgid "Names"
+msgstr "नाव:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "समास हे पडद्यावरिल कडेचे भाग असतात जेथे कुठलीच विंण्डो ठेवली जाऊ शकत नाहीो"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "कार्यक्षेत्रांची संख्या:"
+msgid "_Margins"
+msgstr "समास"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -946,36 +953,36 @@ msgstr "कार्यक्षेत्रांची संख्या:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "विण्डो व्यवस्थापक"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1119,6 +1126,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "कार्यक्षेत्रांची संख्या:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "समास"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "कार्यक्षेत्रास आच्छादित करा"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "कार्यक्षेत्रांची नावे"
 
@@ -1230,10 +1249,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "नाव बदला"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "नाव:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "संपादनाहेतू कार्यक्षेत्राच्या नावावर क्लिक करा"
 
@@ -1253,10 +1268,6 @@ msgstr ""
 #~ msgstr "कार्यक्षेत्रे आणि समास"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "समास"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "विण्डो व्यवस्थापक"
 
diff --git a/po/ms.po b/po/ms.po
index c06fea0..adc9c6f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:49+0900\n"
 "Last-Translator: Harun Musa <mharun at gmx.net>\n"
 "Language-Team: Malay <translation-team-ms at list.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -78,283 +78,282 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Pengurus Tetingkap"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "Pengurus Tetingkap"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Bilangan ruangkerja:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Ruangkerja"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Opaque pindah dan saizsemula"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Layout bebutang"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Aksi dwi klik"
+msgid "<b>_Theme</b>"
+msgstr "Penjajaran Tajuk"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Model fokus"
+msgid "<b>Title fon_t</b>"
+msgstr "Tajuk font"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Fokus tetingkap baru"
+msgid "<b>Title _alignment</b>"
+msgstr "Penjajaran Tajuk"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Bangkit ketika klik"
+msgid "Click and drag the buttons to change the layout"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Bangkit ketika fokus"
+msgid "Title"
+msgstr "Tajuk"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Penjajaran Tajuk"
+msgid "The window title cannot be removed"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Tajuk font"
+msgid "Active"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Fokus tetingkap baru"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Snapping tetingkap"
+msgid "Stick"
+msgstr "Lekat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Wrap ruangkerja"
+msgid "Shade"
+msgstr "Bayang"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Penjajaran Tajuk"
+msgid "Minimize"
+msgstr "Ma_ksimakan"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimakan"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "Tutup"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Sembunyi"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "Layout bebutang"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Tajuk"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Kecil"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Fokus tetingkap baru"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Jarak :"
+msgid "Ke_yboard"
+msgstr "Pintasan Papankekunci"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr ""
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Klik untuk fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Lanjutan"
+msgid "Focus follows _mouse"
+msgstr "Fokus mengikuti tetikus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Automatik tetingkap bangkit \n"
-"bila menerima fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr ""
-"Automatik beri fokus kepada \n"
-"tetingkap baru dicipta"
+msgid "_Delay before window receives focus:"
+msgstr "Lengah sebelum bangkitkan tetingkap difokus :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "Klik untuk fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Tutup"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Model fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Lengah sebelum bangkitkan tetingkap difokus :"
+msgid "Automatically give focus to _newly created windows"
+msgstr ""
+"Automatik beri fokus kepada \n"
+"tetingkap baru dicipta"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Jarak :"
+msgid "<b>New window focus</b>"
+msgstr "Fokus tetingkap baru"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Fokus mengikuti tetikus"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"Automatik tetingkap bangkit \n"
+"bila menerima fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Sembunyi"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Lengah sebelum bangkitkan tetingkap difokus :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "<b>Raise on focus</b>"
+msgstr "Bangkit ketika fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "Raise window when clicking _inside application window"
+msgstr ""
+"Tetingkap bangkit ketika klik didalam\n"
+"tetingkap aplikasi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Pintasan Papankekunci"
+msgid "<b>Raise on click</b>"
+msgstr "Bangkit ketika klik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimakan"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Model fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Snap tetingkap ke sempadan skrin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "Ma_ksimakan"
+msgid "Snap windows to other _windows"
+msgstr "Snap tetingkap ke tetingkap lain"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-"Tetingkap bangkit ketika klik didalam\n"
-"tetingkap aplikasi"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Bayang"
+msgid "Dis_tance:"
+msgstr "Jarak :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Snap tetingkap ke tetingkap lain"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Snap tetingkap ke sempadan skrin"
+msgid "<i>Small</i>"
+msgstr "Kecil"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Lekat"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Jarak :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Aksi untuk dilakukan apabila dwiklik pada bar tajuk :"
+msgid "<b>Windows snapping</b>"
+msgstr "Snapping tetingkap"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Wrap ruangkerja bila penunjuk mencapai sisi skrin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Tajuk"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Wrap ruangkerja bila seretkan tetingkap keluar skrin"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Halangan Sisi :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Wrap ruangkerja"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Wrap ruangkerja bila penunjuk mencapai sisi skrin"
+msgid "Hide content of windows when _resizing"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Lengah sebelum bangkitkan tetingkap difokus :"
+msgid "Hide content of windows when _moving"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Halangan Sisi :"
+msgid "<b>Box move and resize</b>"
+msgstr "Opaque pindah dan saizsemula"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Model fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Aksi untuk dilakukan apabila dwiklik pada bar tajuk :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Aksi dwi klik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Tajuk"
+msgid "Ad_vanced"
+msgstr "Lanjutan"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -750,48 +749,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "Fokus tetingkap baru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "Pintasan Papankekunci"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "Fokus tetingkap baru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "Fokus tetingkap baru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -799,166 +800,172 @@ msgid "Do _nothing"
 msgstr "Tiada apa"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Wrap ruangkerja bila penunjuk mencapai sisi skrin"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Fokus tetingkap baru"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "Ruangkerja"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Wrap ruangkerja bila penunjuk mencapai sisi skrin"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Fokus tetingkap baru"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Lihat kandungan tetingkap apabila dipindahkan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Ruangkerja"
+msgid "C_ompositor"
+msgstr "Pintasan Papankekunci"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Margin"
+msgid "_Number of workspaces:"
+msgstr "Bilangan ruangkerja:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Wrap ruangkerja"
+msgid "Names"
+msgstr "Nama:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Margin adalah kawasan sisi skrin dimana tiada tetingkap diletak"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Bilangan ruangkerja:"
+msgid "_Margins"
+msgstr "Margin"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -966,36 +973,36 @@ msgstr "Bilangan ruangkerja:"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Pengurus Tetingkap"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1137,6 +1144,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Bilangan ruangkerja:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Margin"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Wrap ruangkerja"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Nama ruangkerja"
 
@@ -1248,10 +1267,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Tukarnama"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nama:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Klik atas nama ruangkerja untuk editnya"
 
@@ -1271,10 +1286,6 @@ msgstr ""
 #~ msgstr "Ruangkerja dan Margin"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Margin"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "Pengurus Tetingkap"
 
diff --git a/po/nb.po b/po/nb.po
index fe14b67..6f77702 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-08-19 21:16+0900\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -84,238 +84,238 @@ msgid "Settings manager socket"
 msgstr "Innstillingsbehandlersokkel"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Sett opp vindusoppførsel og hurtigtaster"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Vindusbehandler"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Finjuster vindusoppførsel og effekter"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Sett opp vindusoppførsel og hurtigtaster"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Vindusbehandler Tweaks"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Sett antallet og navn på arbeidsområder:"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Finjuster vindusoppførsel og effekter"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Arbeidsområde"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Dialog flytting og skalering</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Knapputforming</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Handling ved _dobbelklikk</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokusmodell</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Tittel _skrifttype</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Nytt vindu fokus</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Tittel_justering</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Hev ved museklikk</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klikk og dra knappene for å endre utforming"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Hev ved fokus</b>"
+msgid "Title"
+msgstr "Tittel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Tittel_justering</b>"
+msgid "The window title cannot be removed"
+msgstr "Vinduets tittel kan ikke fjernes"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Tittel _skrifttype</b>"
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Vindus_snarveier</b>"
+msgid "Menu"
+msgstr "Meny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Vindussnapping</b>"
+msgid "Stick"
+msgstr "Fast"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Roter arbeidsområdene</b>"
+msgid "Shade"
+msgstr "Rull opp"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Mi_nimer"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimer"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lang</i>"
+msgid "Close"
+msgstr "Lukk"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Skjult"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kort</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Knapputforming</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Liten</i>"
+msgid "_Reset to Defaults"
+msgstr "_Tilbakestill til standardverdier"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Vindus_snarveier</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Bred</i>"
+msgid "Ke_yboard"
+msgstr "_Tastatur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiv"
+msgid "Clic_k to focus"
+msgstr "_Klikk for å fokusere"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vansert"
+msgid "Focus follows _mouse"
+msgstr "Fokus følger _musepekeren"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Automatisk _hev vinduer når de mottar fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Gi _nye vinduer fokus automatisk"
+msgid "_Delay before window receives focus:"
+msgstr "_Forsinkelse før vindu mottar fokus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Klikk for å fokusere"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klikk og dra knappene for å endre utforming"
+msgid "<i>Short</i>"
+msgstr "<i>Kort</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Lukk"
+msgid "<i>Long</i>"
+msgstr "<i>Lang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokusmodell</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Forsikelse _før heving av fokusert vindu:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Gi _nye vinduer fokus automatisk"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Avs_tand:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Nytt vindu fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus følger _musepekeren"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Automatisk _hev vinduer når de mottar fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Skjult"
+msgid "Delay _before raising focused window:"
+msgstr "Forsikelse _før heving av fokusert vindu:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Skjul innhold i vinduer når de _flyttes"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Hev ved fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Skjul innhold i vinduer når _størrelsen endres"
+msgid "Raise window when clicking _inside application window"
+msgstr "Hev vindu ved klikk _innenfor programvinduet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Tastatur"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Hev ved museklikk</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimer"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Meny"
+msgid "Snap windows to screen _border"
+msgstr "Snapp vinduer til skjerm_kanten"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Mi_nimer"
+msgid "Snap windows to other _windows"
+msgstr "Snapp vinduer til andre _vinduer"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Hev vindu ved klikk _innenfor programvinduet"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Rull opp"
+msgid "Dis_tance:"
+msgstr "Avs_tand:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Snapp vinduer til andre _vinduer"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Snapp vinduer til skjerm_kanten"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Liten</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Fast"
+msgid "<i>Wide</i>"
+msgstr "<i>Bred</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Handling som utføres ved dobbelklikk på tittellinjen :"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Vindussnapping</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Vinduets tittel kan ikke fjernes"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Roter arbeidsområdene når muse_pekeren når kanten av skjermen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Tittel"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Roter arbeidsområder ved å _dra vindu av skjermen"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Kantmotstand:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Roter arbeidsområdene</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Roter arbeidsområdene når muse_pekeren når kanten av skjermen"
+msgid "Hide content of windows when _resizing"
+msgstr "Skjul innhold i vinduer når _størrelsen endres"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Forsinkelse før vindu mottar fokus:"
+msgid "Hide content of windows when _moving"
+msgstr "Skjul innhold i vinduer når de _flyttes"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Kantmotstand:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Dialog flytting og skalering</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Handling som utføres ved dobbelklikk på tittellinjen :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Tilbakestill til standardverdier"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Handling ved _dobbelklikk</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "A_vansert"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -658,204 +658,214 @@ msgstr ""
 "Dette vil tilbakestille alle snarveier til standardverdi. Ønsker du å gjøre "
 "dette?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Stor</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Ugjennomsiktig</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Hopp over vinduer som har «hopp over skrivebordoversikt/oppgavelinje» "
+"egenskaper satt"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Inkluder skjulte vinduer (ikonifiserte)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Gjennomsiktig</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Veksle mellom vinduer fra alle arbeidsområdene"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktiver beskyttelse mot stjeling av _fokus"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Tegn ramme rundt valgte vinduer ved rotering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "_Midtstilt på skjermen"
+msgid "C_ycling"
+msgstr "_Veksle mellom"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Som standard, plasser vinduer:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktiver beskyttelse mot stjeling av _fokus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_ompositt"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Overhold ICCCM _standarder for fokus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Veksle mellom"
+msgid "When a window raises itself:"
+msgstr "Når et vindu hever seg selv:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Veksle mellom vinduer fra alle arbeidsområdene"
+msgid "_Bring window on current workspace"
+msgstr "_Ta med vindu til gjeldende arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Vis _fullskjermsvinduer direkte uten å bruke kompositt"
+msgid "Switch to win_dow's workspace"
+msgstr "Bytt til vind_uets arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Gjør _ingenting"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Skjul _vindusramme når maksimert"
+msgid "Key used to _grab and move windows:"
+msgstr "Tast for å ta _tak i og flytte vinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Overhold ICCCM _standarder for fokus"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Hev vinduer ved hvilket som helst museklikk"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "La kritiske vinduer _blinke gjentatte ganger"
+msgid "Hide _frame of windows when maximized"
+msgstr "Skjul _vindusramme når maksimert"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tast for å ta _tak i og flytte vinduer:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Gjenopprett origina_l størrelse på vindu mens det flyttes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Varsle _kritiske vinduer ved at vindusdekorasjonen blinker"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Bruk _kantmotstand istedet for tiltrekning mellom vinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Dekkevne _for vindusdekorasjoner:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Varsle _kritiske vinduer ved at vindusdekorasjonen blinker"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Dekkevne for _inaktive vinduer:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "La kritiske vinduer _blinke gjentatte ganger"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Dekkevne for _sprettoppvinduer:"
+msgid "_Accessibility"
+msgstr "_Tilgjengelighet"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Dekkevne for vinduer som _flyttes:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Bruk _musepekerhjulet over skrivebordet for å bytte arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Dekkevne for vinduer som endrer s_tørrelse"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Gjenopprett origina_l størrelse på vindu mens det flyttes"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Lagre og gjenopprett forrige arbeidsområde ved bytting med hurtigtast."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Vis skygge under sa_mlevinduer"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Bryt arbeidsområdet avhengig av skrivebordets _utforming"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Vis skugge under va_nlige vinduer"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Bryt arbeidsområder når den _første eller siste nås"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Vis skygge under sprett_oppvinduer"
+msgid "_Workspaces"
+msgstr "_Arbeidsområder"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Bytt til vind_uets arbeidsområde"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Under muse_pekeren"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Bruk _kantmotstand istedet for tiltrekning mellom vinduer"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Bruk _musepekerhjulet over skrivebordet for å bytte arbeidsområde"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minimum størrelse på vinduer for å utløse smart plassering"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Når et vindu hever seg selv:"
+msgid "<i>Large</i>"
+msgstr "<i>Stor</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Som standard, plasser vinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Bryt arbeidsområdet avhengig av skrivebordets _utforming"
+msgid "At the _center of the screen"
+msgstr "_Midtstilt på skjermen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Bryt arbeidsområder når den _første eller siste nås"
+msgid "Under the mouse _pointer"
+msgstr "Under muse_pekeren"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Tilgjengelighet"
+msgid "_Placement"
+msgstr "_Plassering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Ta med vindu til gjeldende arbeidsområde"
+msgid "_Enable display compositing"
+msgstr "_Bruk kompositteffekter (skjermeffekter)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Tegn ramme rundt valgte vinduer ved rotering"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Vis _fullskjermsvinduer direkte uten å bruke kompositt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Bruk kompositteffekter (skjermeffekter)"
+msgid "Show shadows under _regular windows"
+msgstr "Vis skugge under va_nlige vinduer"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Vis skygge under sprett_oppvinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Inkluder skjulte vinduer (ikonifiserte)"
+msgid "Show shadows under _dock windows"
+msgstr "Vis skygge under sa_mlevinduer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minimum størrelse på vinduer for å utløse smart plassering"
+msgid "Opaci_ty of window decorations:"
+msgstr "Dekkevne _for vindusdekorasjoner:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Plassering"
+msgid "<i>Transparent</i>"
+msgstr "<i>Gjennomsiktig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Hev vinduer ved hvilket som helst museklikk"
+msgid "<i>Opaque</i>"
+msgstr "<i>Ugjennomsiktig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Lagre og gjenopprett forrige arbeidsområde ved bytting med hurtigtast."
+msgid "Opacity of _inactive windows:"
+msgstr "Dekkevne for _inaktive vinduer:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Dekkevne for vinduer som _flyttes:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Hopp over vinduer som har «hopp over skrivebordoversikt/oppgavelinje» "
-"egenskaper satt"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Dekkevne for vinduer som endrer s_tørrelse"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Dekkevne for _sprettoppvinduer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Arbeidsområder"
+msgid "C_ompositor"
+msgstr "K_ompositt"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marginer</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Antall arbeidsområder:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Arbeidsområder</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Navn:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Marginer er områder ved kantene på skjermen hvor ingen vinduer vil bli "
 "plassert"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Antall arbeidsområder:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Marginer</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -863,35 +873,35 @@ msgstr "_Antall arbeidsområder:"
 msgid "%s (on %s)"
 msgstr "%s (på %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Forgren til bakgrunnen"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Forgren til bakgrunn (ikke støttet)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Sett komposittmodus"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Sett komposittmodus (ikke støttet)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Erstatt den eksisterende vindusbehandleren"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Skriv ut versjonsinformasjon og avslutt"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTER...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Skriv \"%s --help\" for informasjon om bruk."
@@ -1023,12 +1033,15 @@ msgstr "Feil ved lesing av data fra underprosess: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Kan ikke starte «helper-dialog»: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Sett antallet og navn på arbeidsområder:"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Arbeidsområder</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Endre arbeidsområdenavn"
 
-#~ msgid "_Name:"
-#~ msgstr "_Navn:"
-
 #~ msgid "Hide"
 #~ msgstr "Skjul"
 
diff --git a/po/nl.po b/po/nl.po
index 1e14da7..37d4929 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the xfwm4 package.
 # Jasper Huijsmans <jasper at xfce.org>, 2004.
 # Pjotr, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-07 17:03+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-09-09 12:41+0200\n"
 "Last-Translator: Pjotr\n"
 "Language-Team: Dutch (Flemish)\n"
+"Language: nl (Dutch)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl (Dutch)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -84,238 +84,238 @@ msgid "Settings manager socket"
 msgstr "Contactpunt voor instellingenbeheerder"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configureer venstergedrag en sneltoetsen"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Vensterbeheerder"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Fijnregeling venstergedrag en -effecten"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configureer venstergedrag en sneltoetsen"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Vensterbeheerder bijstellen"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Stel het aantal werkbladen (en hun namen) in"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Fijnregeling venstergedrag en -effecten"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Werkbladen"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Veld verplaatsen en grootte veranderen</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Knopvormgeving</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dubbelklik-_actie</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Thema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Vensterscherpstelling-model</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Lettertype titel</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Scherpstelling van nieuw venster</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Titel-uitlijning</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Naar voren halen bij klik</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klik en sleep de knoppen om de vormgeving te veranderen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Naar voren halen bij scherpstelling</b>"
+msgid "Title"
+msgstr "Titel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Titel-uitlijning</b>"
+msgid "The window title cannot be removed"
+msgstr "De venstertitel kan niet worden verwijderd"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Lettertype titel</b>"
+msgid "Active"
+msgstr "Actief"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Venster-_sneltoetsen</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Vensters aantrekken</b>"
+msgid "Stick"
+msgstr "Plakken"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Werkbladen inpakken</b>"
+msgid "Shade"
+msgstr "Oprollen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Thema</b>"
+msgid "Minimize"
+msgstr "Minimaliseren"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximaliseren"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lang</i>"
+msgid "Close"
+msgstr "Sluiten"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Verborgen"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kort</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Knopvormgeving</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stijl"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Klein</i>"
+msgid "_Reset to Defaults"
+msgstr "Zet _terug op standaardwaarden"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Venster-_sneltoetsen</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Breed</i>"
+msgid "Ke_yboard"
+msgstr "_Toetsenbord"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Actief"
+msgid "Clic_k to focus"
+msgstr "Kli_k voor scherpstelling"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Ge_avanceerd"
+msgid "Focus follows _mouse"
+msgstr "Scherpstelling volgt _muis"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Vensters met scherpstelling automatisch naar voren halen"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "_Nieuw gemaakte vensters krijgen automatisch scherpstelling"
+msgid "_Delay before window receives focus:"
+msgstr "_Vertraging voordat een venster scherpstelling verkrijgt:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kli_k voor scherpstelling"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klik en sleep de knoppen om de vormgeving te veranderen"
+msgid "<i>Short</i>"
+msgstr "<i>Kort</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Sluiten"
+msgid "<i>Long</i>"
+msgstr "<i>Lang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Vensterscherpstelling-model</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Vertraging _voor naar voren halen vensters:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "_Nieuw gemaakte vensters krijgen automatisch scherpstelling"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Afstand:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Scherpstelling van nieuw venster</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Scherpstelling volgt _muis"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Vensters met scherpstelling automatisch naar voren halen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Verborgen"
+msgid "Delay _before raising focused window:"
+msgstr "Vertraging _voor naar voren halen vensters:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Inhoud vensters verbergen bij _verplaatsen"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Naar voren halen bij scherpstelling</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Inhoud vensters verbergen bij veranderen _grootte"
+msgid "Raise window when clicking _inside application window"
+msgstr "Venster naar voren halen bij klikken in toepassingvenster"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Toetsenbord"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Naar voren halen bij klik</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximaliseren"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "Scher_pstelling"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Vensters naar _schermrand trekken"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimaliseren"
+msgid "Snap windows to other _windows"
+msgstr "Vensters naar andere _vensters trekken"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Venster naar voren halen bij klikken in toepassingvenster"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Oprollen"
+msgid "Dis_tance:"
+msgstr "_Afstand:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Vensters naar andere _vensters trekken"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Vensters naar _schermrand trekken"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Klein</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Plakken"
+msgid "<i>Wide</i>"
+msgstr "<i>Breed</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Actie voor dubbelklikken op de titelbalk "
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Vensters aantrekken</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "De venstertitel kan niet worden verwijderd"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Verpak werkbladen wanneer de _muisaanwijzer de rand van het scherm bereikt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titel"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Verpak werkbladen bij _slepen voorbij de rand van het scherm"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Weerstand van de _rand:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Werkbladen inpakken</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Verpak werkbladen wanneer de _muisaanwijzer de rand van het scherm bereikt"
+msgid "Hide content of windows when _resizing"
+msgstr "Inhoud vensters verbergen bij veranderen _grootte"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Vertraging voordat een venster scherpstelling verkrijgt:"
+msgid "Hide content of windows when _moving"
+msgstr "Inhoud vensters verbergen bij _verplaatsen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Weerstand van de _rand:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Veld verplaatsen en grootte veranderen</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "Scher_pstelling"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Actie voor dubbelklikken op de titelbalk "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Zet _terug op standaardwaarden"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dubbelklik-_actie</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stijl"
+msgid "Ad_vanced"
+msgstr "Ge_avanceerd"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -653,203 +653,200 @@ msgstr ""
 "Dit zal alle sneltoetsen terugzetten naar hun standaardwaarden. Wilt u dit "
 "echt doen?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Groot</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Ondoorzichtig</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Vensters over_slaan die de \"pager overslaan\"\n"
+"of \"taakbalk overslaan\" eigenschappen hebben"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Voeg verborgen (geminimaliseerde) vensters toe"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparant</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Wissel af _tussen vensters van alle werkbladen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Activeer preventie voor overpakken van scherpstelling"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "Teken rand rond geselecteerd venster tijdens het afwisselen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "In het _midden van het scherm"
+msgid "C_ycling"
+msgstr "Aan het afwisselen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Plaats vensters standaard:"
+msgid "Activate _focus stealing prevention"
+msgstr "Activeer preventie voor overpakken van scherpstelling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Samensteller"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Houd vast aan de standaard ICCCM focus hint"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Aan het afwisselen"
+msgid "When a window raises itself:"
+msgstr "Wanneer een venster zichzelf naar de voorgrond brengt:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Wissel af _tussen vensters van alle werkbladen"
+msgid "_Bring window on current workspace"
+msgstr "Venster naar huidig werkblad ver_plaatsen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Geef _volledig schermvullende vensters direct weer"
+msgid "Switch to win_dow's workspace"
+msgstr "Wissel naar het _werkblad van het venster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Doe _niets"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Verberg randen van vensters wanneer gemaximaliseerd"
+msgid "Key used to _grab and move windows:"
+msgstr "Toets _gebruikt voor het pakken en verplaatsen van vensters:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Houd vast aan de standaard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr ""
+"Vensters naar _boven halen wanneer er op een willekeurige muisknop wordt "
+"geklikt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Laat _belangrijke vensters herhaaldelijk knipperen"
+msgid "Hide _frame of windows when maximized"
+msgstr "Verberg randen van vensters wanneer gemaximaliseerd"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Toets _gebruikt voor het pakken en verplaatsen van vensters:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Herstel oorspronkelijke _grootte bij verplaatsen van gemaximaliseerde "
+"vensters"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Meld _urgentie door de vensterdecoratie te laten knipperen"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Gebruik _randweerstand in plaats van het aanvoegen van vensters"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Ondoorzich_tigheid van vensterdecoraties:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Meld _urgentie door de vensterdecoratie te laten knipperen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Ondoorzichtigheid van _inactieve vensters:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Laat _belangrijke vensters herhaaldelijk knipperen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Ondoorzichtigheid van opduikvenster_s:"
+msgid "_Accessibility"
+msgstr "_Toegankelijkheid"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Ondoorzichtigheid van vensters tijdens verp_laatsen:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Gebruik het _muiswieltje op het bureaublad om werkbladen te wisselen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Ondoorzichtigheid van vensters bij _veranderen grootte:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Herstel oorspronkelijke _grootte bij verplaatsen van gemaximaliseerde "
-"vensters"
+"Vorige werkblad _onthouden en oproepen\n"
+"wanneer er wordt gewisseld via sneltoetsen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Schaduwen weergeven onder _dokvensters"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Verpak werkbladen afhankelijk van de eigenlijke bureaubla_dvormgeving"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Schaduwen weergeven onder _normale vensters"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Verpak werkbladen wanneer het _eerste of laatste werkblad is bereikt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Schaduwen weergeven onder _opduikvensters"
+msgid "_Workspaces"
+msgstr "_Werkbladen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Wissel naar het _werkblad van het venster"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Onder de muis_pijl"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Gebruik _randweerstand in plaats van het aanvoegen van vensters"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Gebruik het _muiswieltje op het bureaublad om werkbladen te wisselen"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minimum-venstergrootte om slimme plaatsing te activeren:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Wanneer een venster zichzelf naar de voorgrond brengt:"
+msgid "<i>Large</i>"
+msgstr "<i>Groot</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Plaats vensters standaard:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Verpak werkbladen afhankelijk van de eigenlijke bureaubla_dvormgeving"
+msgid "At the _center of the screen"
+msgstr "In het _midden van het scherm"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Verpak werkbladen wanneer het _eerste of laatste werkblad is bereikt"
+msgid "Under the mouse _pointer"
+msgstr "Onder de muis_pijl"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Toegankelijkheid"
+msgid "_Placement"
+msgstr "_Plaatsing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Venster naar huidig werkblad ver_plaatsen"
+msgid "_Enable display compositing"
+msgstr "_Activeer schermsamenvoeging"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "Teken rand rond geselecteerd venster tijdens het afwisselen"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Geef _volledig schermvullende vensters direct weer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Activeer schermsamenvoeging"
+msgid "Show shadows under _regular windows"
+msgstr "Schaduwen weergeven onder _normale vensters"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Schaduwen weergeven onder _opduikvensters"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Voeg verborgen (geminimaliseerde) vensters toe"
+msgid "Show shadows under _dock windows"
+msgstr "Schaduwen weergeven onder _dokvensters"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minimum-venstergrootte om slimme plaatsing te activeren:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Ondoorzich_tigheid van vensterdecoraties:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Plaatsing"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparant</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr ""
-"Vensters naar _boven halen wanneer er op een willekeurige muisknop wordt "
-"geklikt"
+msgid "<i>Opaque</i>"
+msgstr "<i>Ondoorzichtig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Vorige werkblad _onthouden en oproepen\n"
-"wanneer er wordt gewisseld via sneltoetsen"
+msgid "Opacity of _inactive windows:"
+msgstr "Ondoorzichtigheid van _inactieve vensters:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Ondoorzichtigheid van vensters tijdens verp_laatsen:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Vensters over_slaan die de \"pager overslaan\"\n"
-"of \"taakbalk overslaan\" eigenschappen hebben"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Ondoorzichtigheid van vensters bij _veranderen grootte:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Ondoorzichtigheid van opduikvenster_s:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Werkbladen"
+msgid "C_ompositor"
+msgstr "_Samensteller"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Aantal werkbladen:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
 msgid "Layout"
 msgstr "Vormgeving"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid ""
-"Margins are areas on the edges of the screen where no window will be placed"
-msgstr ""
-"Marges zijn gebieden aan de randen van het scherm waar geen vensters "
-"geplaatst worden"
-
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 msgid "Names"
 msgstr "Namen"
 
@@ -858,12 +855,15 @@ msgid "_General"
 msgstr "Al_gemeen"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
-msgid "_Margins"
-msgstr "_Marges"
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr ""
+"Marges zijn gebieden aan de randen van het scherm waar geen vensters "
+"geplaatst worden"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
-msgid "_Number of workspaces:"
-msgstr "Aantal werkbladen:"
+msgid "_Margins"
+msgstr "_Marges"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1032,6 +1032,9 @@ msgstr "Fout bij het lezen van gegevens van het afgeleide proces: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Kan hulpdialoog niet uitzaaien: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Stel het aantal werkbladen (en hun namen) in"
+
 #~ msgid "<b>Margins</b>"
 #~ msgstr "<b>Marges</b>"
 
diff --git a/po/nn.po b/po/nn.po
index d52074c..bc87783 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 21:39+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-02-08 18:04+0100\n"
 "Last-Translator: Eivind Ødegård <gingermi at yahoo.no>\n"
 "Language-Team: nn_NO <i18n-nn at lister.ping.uio.no>\n"
@@ -41,25 +41,25 @@ msgstr "Sokkel for innstillingshandterar"
 
 #: ../settings-dialogs/tweaks-settings.c:436
 #: ../settings-dialogs/workspace-settings.c:380
-#: ../settings-dialogs/xfwm4-settings.c:311
+#: ../settings-dialogs/xfwm4-settings.c:315
 msgid "SOCKET ID"
 msgstr "SOKKEL-ID"
 
 #: ../settings-dialogs/tweaks-settings.c:437
 #: ../settings-dialogs/workspace-settings.c:381
-#: ../settings-dialogs/xfwm4-settings.c:313
+#: ../settings-dialogs/xfwm4-settings.c:317
 msgid "Version information"
 msgstr "Informasjon om denne utgåva"
 
 #: ../settings-dialogs/tweaks-settings.c:455
 #: ../settings-dialogs/workspace-settings.c:398
-#: ../settings-dialogs/xfwm4-settings.c:960
+#: ../settings-dialogs/xfwm4-settings.c:964
 msgid "."
 msgstr "."
 
 #: ../settings-dialogs/tweaks-settings.c:459
 #: ../settings-dialogs/workspace-settings.c:402
-#: ../settings-dialogs/xfwm4-settings.c:964
+#: ../settings-dialogs/xfwm4-settings.c:968
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -79,242 +79,242 @@ msgid "Workspace Name"
 msgstr "Namn på arbeidsområdet"
 
 #: ../settings-dialogs/workspace-settings.c:380
-#: ../settings-dialogs/xfwm4-settings.c:311
+#: ../settings-dialogs/xfwm4-settings.c:315
 msgid "Settings manager socket"
 msgstr "Sokkel for innstillingshandterar"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Set opp åtferda og utsjånaden for vindaugo"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Vindaugshandsamar"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Finstill korleis vindaugo og effektar verkar"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Set opp åtferda og utsjånaden for vindaugo"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Finstill vindaugshandsamaraen"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Sei kor mange arbeidsområde du vil ha, og kva dei skal heita"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Finstill korleis vindaugo og effektar verkar"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Arbeidsområde"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Flytt og endra storleik på boksar</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Knappeutforming</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dobbelklikkh_andling</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Bunad</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokustype</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Tittel_skrift</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus på nye vindaugo</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Tittel_justering</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Hev om klikka</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klikk og dra knappane for å endra utforminga"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Hev om fokus</b>"
+msgid "Title"
+msgstr "Tittel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Tittel_justering</b>"
+msgid "The window title cannot be removed"
+msgstr "Du kan ikkje fjerna vindaugstittelen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Tittel_skrift</b>"
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Vindaugs_snøggtastar</b>"
+msgid "Menu"
+msgstr "Meny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Vindaugefesting</b>"
+msgid "Stick"
+msgstr "Fest"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Snu arbeidsområde</b>"
+msgid "Shade"
+msgstr "Skugge"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Bunad</b>"
+msgid "Minimize"
+msgstr "Minimer"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimer"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lang</i>"
+msgid "Close"
+msgstr "Lukk"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Gøymt"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kort</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Knappeutforming</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Liten</i>"
+msgid "_Reset to Defaults"
+msgstr "_Tilbakestill til standardverdiar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Vindaugs_snøggtastar</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Brei</i>"
+msgid "Ke_yboard"
+msgstr "Ta_statur"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiv"
+msgid "Clic_k to focus"
+msgstr "Kli_kk for fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Avansert"
+msgid "Focus follows _mouse"
+msgstr "Fokus fylgjer _musa"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Hev vindaugo automatisk når dei får fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Gje fokus automatisk til _nye vindaugo"
+msgid "_Delay before window receives focus:"
+msgstr "Seinking før vin_dauga får fokus: "
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Kli_kk for fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klikk og dra knappane for å endra utforminga"
+msgid "<i>Short</i>"
+msgstr "<i>Kort</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Lukk"
+msgid "<i>Long</i>"
+msgstr "<i>Lang</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokustype</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Seinking _før me hevar fokuserte vindaugo:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Gje fokus automatisk til _nye vindaugo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Avs_tand: "
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus på nye vindaugo</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus fylgjer _musa"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Hev vindaugo automatisk når dei får fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Gøymt"
+msgid "Delay _before raising focused window:"
+msgstr "Seinking _før me hevar fokuserte vindaugo:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Gøym vindaugsinnhaldet når du _flyttar dei"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Hev om fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Gøym vindaugsinnhaldet når du endrar _storleik"
+msgid "Raise window when clicking _inside application window"
+msgstr "Hev vindauga når du klikkar _inni eit programvindauga"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Ta_statur"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Hev om klikka</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimer"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Meny"
+msgid "Snap windows to screen _border"
+msgstr "Fest vindaugo til skjerm_kanten"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimer"
+msgid "Snap windows to other _windows"
+msgstr "Fest vindaugo til andre _vindaugo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Hev vindauga når du klikkar _inni eit programvindauga"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Skugge"
+msgid "Dis_tance:"
+msgstr "Avs_tand: "
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Fest vindaugo til andre _vindaugo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Fest vindaugo til skjerm_kanten"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Liten</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Fest"
+msgid "<i>Wide</i>"
+msgstr "<i>Brei</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Kva handling me skal utføra når du dobbeltklikkar tittellinja"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Vindaugefesting</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Du kan ikkje fjerna vindaugstittelen"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Snu arbeidsområde når _peikaren kjem nær skjermkanten"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Tittel"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "s"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Kantmotstand: "
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Snu arbeidsområde</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Snu arbeidsområde når _peikaren kjem nær skjermkanten"
+msgid "Hide content of windows when _resizing"
+msgstr "Gøym vindaugsinnhaldet når du endrar _storleik"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Seinking før vin_dauga får fokus: "
+msgid "Hide content of windows when _moving"
+msgstr "Gøym vindaugsinnhaldet når du _flyttar dei"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Kantmotstand: "
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Flytt og endra storleik på boksar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Kva handling me skal utføra når du dobbeltklikkar tittellinja"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Tilbakestill til standardverdiar"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dobbelklikkh_andling</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "_Avansert"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -511,321 +511,356 @@ msgid "Move window to workspace 12"
 msgstr "Flytt vindauga til arbeidsområde 12"
 
 #: ../settings-dialogs/xfwm4-settings.c:281
+#, fuzzy
+msgid "Tile window to the top"
+msgstr "Flytt dette vindauga til venstre arbeidsområdet"
+
+#: ../settings-dialogs/xfwm4-settings.c:282
+#, fuzzy
+msgid "Tile window to the bottom"
+msgstr "Flytt dette vindauga til nedste arbeidsområdet"
+
+#: ../settings-dialogs/xfwm4-settings.c:283
+#, fuzzy
+msgid "Tile window to the left"
+msgstr "Flytt dette vindauga til venstre arbeidsområdet"
+
+#: ../settings-dialogs/xfwm4-settings.c:284
+#, fuzzy
+msgid "Tile window to the right"
+msgstr "Flytt dette vindauga til høgre arbeidsområdet"
+
+#: ../settings-dialogs/xfwm4-settings.c:285
 msgid "Show desktop"
 msgstr "Vis skrivebordet"
 
-#: ../settings-dialogs/xfwm4-settings.c:282
+#: ../settings-dialogs/xfwm4-settings.c:286
 msgid "Upper workspace"
 msgstr "Øvste arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:283
+#: ../settings-dialogs/xfwm4-settings.c:287
 msgid "Bottom workspace"
 msgstr "Nedste arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:284
+#: ../settings-dialogs/xfwm4-settings.c:288
 msgid "Left workspace"
 msgstr "Venstre arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:285
+#: ../settings-dialogs/xfwm4-settings.c:289
 msgid "Right workspace"
 msgstr "Høgre arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:286
+#: ../settings-dialogs/xfwm4-settings.c:290
 msgid "Previous workspace"
 msgstr "Førre arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:287
+#: ../settings-dialogs/xfwm4-settings.c:291
 msgid "Next workspace"
 msgstr "Neste arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:288
+#: ../settings-dialogs/xfwm4-settings.c:292
 msgid "Workspace 1"
 msgstr "Arbeidsområde 1"
 
-#: ../settings-dialogs/xfwm4-settings.c:289
+#: ../settings-dialogs/xfwm4-settings.c:293
 msgid "Workspace 2"
 msgstr "Arbeidsområde 2"
 
-#: ../settings-dialogs/xfwm4-settings.c:290
+#: ../settings-dialogs/xfwm4-settings.c:294
 msgid "Workspace 3"
 msgstr "Arbeidsområde 3"
 
-#: ../settings-dialogs/xfwm4-settings.c:291
+#: ../settings-dialogs/xfwm4-settings.c:295
 msgid "Workspace 4"
 msgstr "Arbeidsområde 4"
 
-#: ../settings-dialogs/xfwm4-settings.c:292
+#: ../settings-dialogs/xfwm4-settings.c:296
 msgid "Workspace 5"
 msgstr "Arbeidsområde 5"
 
-#: ../settings-dialogs/xfwm4-settings.c:293
+#: ../settings-dialogs/xfwm4-settings.c:297
 msgid "Workspace 6"
 msgstr "Arbeidsområde 6"
 
-#: ../settings-dialogs/xfwm4-settings.c:294
+#: ../settings-dialogs/xfwm4-settings.c:298
 msgid "Workspace 7"
 msgstr "Arbeidsområde 7"
 
-#: ../settings-dialogs/xfwm4-settings.c:295
+#: ../settings-dialogs/xfwm4-settings.c:299
 msgid "Workspace 8"
 msgstr "Arbeidsområde 8"
 
-#: ../settings-dialogs/xfwm4-settings.c:296
+#: ../settings-dialogs/xfwm4-settings.c:300
 msgid "Workspace 9"
 msgstr "Arbeidsområde 9"
 
-#: ../settings-dialogs/xfwm4-settings.c:297
+#: ../settings-dialogs/xfwm4-settings.c:301
 msgid "Workspace 10"
 msgstr "Arbeidsområde 10"
 
-#: ../settings-dialogs/xfwm4-settings.c:298
+#: ../settings-dialogs/xfwm4-settings.c:302
 msgid "Workspace 11"
 msgstr "Arbeidsområde 11"
 
-#: ../settings-dialogs/xfwm4-settings.c:299
+#: ../settings-dialogs/xfwm4-settings.c:303
 msgid "Workspace 12"
 msgstr "Arbeidsområde 12"
 
-#: ../settings-dialogs/xfwm4-settings.c:300
+#: ../settings-dialogs/xfwm4-settings.c:304
 msgid "Add workspace"
 msgstr "Legg til eit arbeidsområde"
 
-#: ../settings-dialogs/xfwm4-settings.c:301
+#: ../settings-dialogs/xfwm4-settings.c:305
 msgid "Add adjacent workspace"
 msgstr "Legg til nabo-arbeidsområde"
 
-#: ../settings-dialogs/xfwm4-settings.c:302
+#: ../settings-dialogs/xfwm4-settings.c:306
 msgid "Delete last workspace"
 msgstr "Slett siste arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:303
+#: ../settings-dialogs/xfwm4-settings.c:307
 msgid "Delete active workspace"
 msgstr "Slett dette arbeidsområdet"
 
-#: ../settings-dialogs/xfwm4-settings.c:449
+#: ../settings-dialogs/xfwm4-settings.c:453
 msgid "Theme"
 msgstr "Bunad"
 
-#: ../settings-dialogs/xfwm4-settings.c:598
+#: ../settings-dialogs/xfwm4-settings.c:602
 msgid "Action"
 msgstr "Handling"
 
-#: ../settings-dialogs/xfwm4-settings.c:603
+#: ../settings-dialogs/xfwm4-settings.c:607
 msgid "Shortcut"
 msgstr "Snarveg"
 
-#: ../settings-dialogs/xfwm4-settings.c:989
+#: ../settings-dialogs/xfwm4-settings.c:993
 #, c-format
 msgid "Failed to initialize xfconf. Reason: %s"
 msgstr "Greidde ikkje starta xfconf. Grunngjeving: %s"
 
-#: ../settings-dialogs/xfwm4-settings.c:1000
+#: ../settings-dialogs/xfwm4-settings.c:1004
 msgid "Could not create the settings dialog."
 msgstr "Klarte ikkje laga innstillingsruta."
 
-#: ../settings-dialogs/xfwm4-settings.c:1887
-#: ../settings-dialogs/xfwm4-settings.c:1888
+#: ../settings-dialogs/xfwm4-settings.c:1891
+#: ../settings-dialogs/xfwm4-settings.c:1892
 msgid "Reset to Defaults"
 msgstr "Nullstill til standardverdiane"
 
-#: ../settings-dialogs/xfwm4-settings.c:1889
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Dette nullstiller alle snarvegar til standardverdiane. Vil du verkeleg gjera dette?"
-
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Stor</i>"
+#: ../settings-dialogs/xfwm4-settings.c:1893
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Dette nullstiller alle snarvegar til standardverdiane. Vil du verkeleg gjera "
+"dette?"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Heildekkjande</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "_Hopp over vindaugo som har «hopp over»-eigenskapar"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Ta med _gøymde (ikonifiserte) vindaugo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Gjennomsiktig</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Ruller gjennom _vindaugo på alle arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Slå på hinder for fokussteling"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Teikn ei ramme rundt valde vindaugo når me rullerer gjennom dei"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "I _midten av skjermen"
+msgid "C_ycling"
+msgstr "R_ullering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Plasser vindaugo vanlegvis: "
+msgid "Activate _focus stealing prevention"
+msgstr "Slå på hinder for fokussteling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "S_amansetjing"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Bruk _standard ICCCM-fokushint"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "R_ullering"
+msgid "When a window raises itself:"
+msgstr "Når eit vindauga blir heva: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Ruller gjennom _vindaugo på alle arbeidsområde"
+msgid "_Bring window on current workspace"
+msgstr "_Bring vindauga til dette arbeidsområdet"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Vis overlagde _fullskjermvindaugo direkte"
+msgid "Switch to win_dow's workspace"
+msgstr "Byt til arbeidsområ_det åt vindauga"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Ikkje gjer _noko"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Gøym vinaugs_rammer når dei er maksimerte"
+msgid "Key used to _grab and move windows:"
+msgstr "Tast for å _ta tak i og flytta vindaugo: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Bruk _standard ICCCM-fokushint"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Hev vindaugo når ein museknapp blir trykt inn"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "La viktige vindaugo _blinka"
+msgid "Hide _frame of windows when maximized"
+msgstr "Gøym vinaugs_rammer når dei er maksimerte"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tast for å _ta tak i og flytta vindaugo: "
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Gjenopprett original_storleiken for maksimerte vindaugo under flytting"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Varsla _viktige vindaugo ved å la vindaugspynten blinke"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Bruk kantmotstand i staden for vindaugsfesting"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Gjennomsik_t for vindaugspynt: "
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Varsla _viktige vindaugo ved å la vindaugspynten blinke"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Gjennomsikt på _inaktive vindaugo: "
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "La viktige vindaugo _blinka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "GJennomsikt for opp_sprettvindaugo: "
+msgid "_Accessibility"
+msgstr "_Tilgjenge"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Vindaugsgjennomsikt ved _flytting: "
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Bruk _musehjulet på skrivebordet for å byta arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Vindaugsgjennomsikt når me endrar _storleik:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Gjenopprett original_storleiken for maksimerte vindaugo under flytting"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Hugs og gjenopprett tidlegare arbeidsområde\n"
+"når me byter arbeidsområde via snøggtastar"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Vis skuggar under _dokka vindaugo"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Snu arbeidsområde avhengig av skrivebords_utforminga"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Vis skuggar under _vanlege vindaugo"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Snu arbeidsområde me når når _fyrste eller siste arbeidsområdet"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Vis skuggar under _oppsprettvindaugo"
+msgid "_Workspaces"
+msgstr "_Arbeidsområde"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Byt til arbeidsområ_det åt vindauga"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Under muse_peikaren"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Bruk kantmotstand i staden for vindaugsfesting"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Bruk _musehjulet på skrivebordet for å byta arbeidsområde"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minste storleik på vindaugo for å slå på smart plassering:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Når eit vindauga blir heva: "
+msgid "<i>Large</i>"
+msgstr "<i>Stor</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Plasser vindaugo vanlegvis: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Snu arbeidsområde avhengig av skrivebords_utforminga"
+msgid "At the _center of the screen"
+msgstr "I _midten av skjermen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Snu arbeidsområde me når når _fyrste eller siste arbeidsområdet"
+msgid "Under the mouse _pointer"
+msgstr "Under muse_peikaren"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Tilgjenge"
+msgid "_Placement"
+msgstr "_Plassering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Bring vindauga til dette arbeidsområdet"
+msgid "_Enable display compositing"
+msgstr "Slå på bil_etsamansetjing"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Teikn ei ramme rundt valde vindaugo når me rullerer gjennom dei"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Vis overlagde _fullskjermvindaugo direkte"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Slå på bil_etsamansetjing"
+msgid "Show shadows under _regular windows"
+msgstr "Vis skuggar under _vanlege vindaugo"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Vis skuggar under _oppsprettvindaugo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Ta med _gøymde (ikonifiserte) vindaugo"
+msgid "Show shadows under _dock windows"
+msgstr "Vis skuggar under _dokka vindaugo"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minste storleik på vindaugo for å slå på smart plassering:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Gjennomsik_t for vindaugspynt: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Plassering"
+msgid "<i>Transparent</i>"
+msgstr "<i>Gjennomsiktig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Hev vindaugo når ein museknapp blir trykt inn"
+msgid "<i>Opaque</i>"
+msgstr "<i>Heildekkjande</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Hugs og gjenopprett tidlegare arbeidsområde\n"
-"når me byter arbeidsområde via snøggtastar"
+msgid "Opacity of _inactive windows:"
+msgstr "Gjennomsikt på _inaktive vindaugo: "
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Vindaugsgjennomsikt ved _flytting: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "_Hopp over vindaugo som har «hopp over»-eigenskapar"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Vindaugsgjennomsikt når me endrar _storleik:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "GJennomsikt for opp_sprettvindaugo: "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Arbeidsområde"
+msgid "C_ompositor"
+msgstr "S_amansetjing"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margar</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Tal på arbeidsområde: "
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Arbeidsområde</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-msgid "Margins are areas on the edges of the screen where no window will be placed"
-msgstr "Margar er område langs kanten av skjermen der du ikkje kan plassera vindaugo"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Tal på arbeidsområde: "
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr ""
+"Margar er område langs kanten av skjermen der du ikkje kan plassera vindaugo"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margar</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -833,35 +868,35 @@ msgstr "_Tal på arbeidsområde: "
 msgid "%s (on %s)"
 msgstr "%s (på %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Splitt til bakgrunnen"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Splitt til bakgrunnen (ikkje støtta)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Avgjer samansetjingsmodusen"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Avgjer samansetjingsmodusen (ikkje støtta)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Byt ut den eksisterande vindaugshandteraren"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Vis versjonsinformasjonen og avslutt"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENT...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Skriv «%s --help» for bruksinstruksjonar"
@@ -971,7 +1006,8 @@ msgstr "%s: Klarer ikkje tildela farga %s\n"
 #: ../src/settings.c:275
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
-msgstr "%s: Kan ikkje tildela farga: Gverdien for farga er ikkje av typen STRENG"
+msgstr ""
+"%s: Kan ikkje tildela farga: Gverdien for farga er ikkje av typen STRENG"
 
 #: ../src/settings.c:282
 #, c-format
@@ -993,3 +1029,8 @@ msgstr "Klarte ikkje å lesa data frå barneprosess: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Klarer ikkje starta hjelpar-rute: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Sei kor mange arbeidsområde du vil ha, og kva dei skal heita"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Arbeidsområde</b>"
diff --git a/po/pa.po b/po/pa.po
index 32ae064..2ed5dcd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2007-01-05 23:06+0530\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
@@ -85,280 +85,279 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "ਵਿੰਡੋ ਐਕਸ਼ਨ ਰੱਦ ਕਰੋ"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "ਵਿੰਡੋ ਐਕਸ਼ਨ ਰੱਦ ਕਰੋ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ ਟਵੀਕ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "ਅਖਾੜਿਆਂ ਦੀ ਗਿਣਤੀ:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "ਵਿੰਡੋ ਐਕਸ਼ਨ ਰੱਦ ਕਰੋ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "ਵਰਕਸਪੇਸ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "ਅਪਾਰਦਰਸ਼ੀ ਹਿਲਾਉਣ ਅਤੇ ਮੁੜ ਆਕਾਰ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "ਹੇਠਾਂ ਖਾਕਾ"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "ਕਿਰਿਆ ਤੇ ਡਬਲ ਕਲਿੱਕ ਕਰੋ"
+msgid "<b>_Theme</b>"
+msgstr "ਸਿਰਲੇਖ ਸਥਿਤੀ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "ਕੇਂਦਰਿਤ ਮਾਡਲ"
+msgid "<b>Title fon_t</b>"
+msgstr "ਸਿਰਲੇਖ ਫੋਂਟ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "ਨਵਾਂ ਵਿੰਡੋ ਕੇਂਦਰਿਤ"
+msgid "<b>Title _alignment</b>"
+msgstr "ਸਿਰਲੇਖ ਸਥਿਤੀ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "ਕਲਿੱਕ ਕਰਨ ਤੇ ਪੇਸ਼ਗੀ"
+msgid "Click and drag the buttons to change the layout"
+msgstr "ਖਾਕਾ ਤਬਦੀਲ ਕਰਨ ਲਈ ਖਿੱਚੋ ਬਟਨ ਤੇ ਕਲਿੱਕ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "ਕੇਂਦਰਿਤ ਹੋਣ ਤੇ ਉਭਾਰੋ"
+msgid "Title"
+msgstr "ਸਿਰਲੇਖ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "ਸਿਰਲੇਖ ਸਥਿਤੀ"
+msgid "The window title cannot be removed"
+msgstr "ਵਿੰਡੋ ਸਿਰਲੇਖ, ਇਹ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "ਸਿਰਲੇਖ ਫੋਂਟ"
+msgid "Active"
+msgstr "ਸਰਗਰਮ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "ਵਿੰਡੋ ਸ਼ਾਰਟਕੱਟ"
+msgid "Menu"
+msgstr "ਮੇਨੂ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "ਵਿੰਡੋ ਤਸਵੀਰ"
+msgid "Stick"
+msgstr "ਚਿਪਕਿਆ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
+msgid "Shade"
+msgstr "ਛਾਂ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "ਸਿਰਲੇਖ ਸਥਿਤੀ"
+msgid "Minimize"
+msgstr "_ਅਧਿਕਤਮ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "ਅਧਿਕਤਮ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "ਵੱਡਾ"
+msgid "Close"
+msgstr "ਬੰਦ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "ਓਹਲੇ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "ਟਰਾਂਸਪੇਰਟ"
+msgid "<b>Button layout</b>"
+msgstr "ਹੇਠਾਂ ਖਾਕਾ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "ਸ਼ੈਲੀ"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "ਛੋਟਾ"
+msgid "<b>Window _shortcuts</b>"
+msgstr "ਵਿੰਡੋ ਸ਼ਾਰਟਕੱਟ"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "ਚੌੜਾ"
+msgid "Ke_yboard"
+msgstr "ਕੀ-ਬੋਰਡ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "ਸਰਗਰਮ"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "ਕੇਂਦਰਿਤ ਕਰਨ ਲਈ ਦਬਾਓ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "ਤਕਨੀਕੀ"
+msgid "Focus follows _mouse"
+msgstr "ਮਾਊਸ ਦੇ ਪਿੱਛੇ ਕੇਂਦਰਿਤ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "ਕੇਂਦ੍ਰਿਤ ਹੋਣ ਉਪਰੰਤ ਵਿੰਡੋ ਸਵੈ-ਪੇਸ਼ ਕਰੋ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "ਨਵੇਂ ਝਰੋਖੇ ਉੱਪਰ ਸਵੈ ਕੇਂਦ੍ਰਿਤ ਕਰੋ"
+msgid "_Delay before window receives focus:"
+msgstr "ਕੇਂਦ੍ਰਿਤ ਵਿੰਡੋ ਪੇਸ਼ਗੀ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤਰਾਲ ਃ"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "ਕੇਂਦਰਿਤ ਕਰਨ ਲਈ ਦਬਾਓ"
+msgid "<i>Short</i>"
+msgstr "ਟਰਾਂਸਪੇਰਟ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "ਖਾਕਾ ਤਬਦੀਲ ਕਰਨ ਲਈ ਖਿੱਚੋ ਬਟਨ ਤੇ ਕਲਿੱਕ ਕਰੋ"
+msgid "<i>Long</i>"
+msgstr "ਵੱਡਾ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "ਬੰਦ"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "ਕੇਂਦਰਿਤ ਮਾਡਲ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "ਕੇਂਦ੍ਰਿਤ ਵਿੰਡੋ ਪੇਸ਼ਗੀ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤਰਾਲ ਃ"
+msgid "Automatically give focus to _newly created windows"
+msgstr "ਨਵੇਂ ਝਰੋਖੇ ਉੱਪਰ ਸਵੈ ਕੇਂਦ੍ਰਿਤ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "ਅੰਤਰ:"
+msgid "<b>New window focus</b>"
+msgstr "ਨਵਾਂ ਵਿੰਡੋ ਕੇਂਦਰਿਤ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "ਮਾਊਸ ਦੇ ਪਿੱਛੇ ਕੇਂਦਰਿਤ"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "ਕੇਂਦ੍ਰਿਤ ਹੋਣ ਉਪਰੰਤ ਵਿੰਡੋ ਸਵੈ-ਪੇਸ਼ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "ਓਹਲੇ"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "ਕੇਂਦ੍ਰਿਤ ਵਿੰਡੋ ਪੇਸ਼ਗੀ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤਰਾਲ ਃ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "ਹਿਲਾਉਣ ਉਪਰੰਤ ਝਰੋਖੇ ਦੇ ਸੰਖੇਪ ਵਿਖਾਓ+-"
+msgid "<b>Raise on focus</b>"
+msgstr "ਕੇਂਦਰਿਤ ਹੋਣ ਤੇ ਉਭਾਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "ਮੁੜ ਆਕਾਰ ਦੇਣ ਉਪਰੰਤ ਝਰੋਖੇ ਦੇ ਸੰਖੇਪ ਵਿਖਾਓ"
+msgid "Raise window when clicking _inside application window"
+msgstr "ਕਾਰਜ ਝਰੋਖੇ ਵਿੱਚ ਕਲਿੱਕ ਕਰਨ ਉਪਰੰਤ ਵਿੰਡੋ ਪੇਸ਼ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "ਕੀ-ਬੋਰਡ"
+msgid "<b>Raise on click</b>"
+msgstr "ਕਲਿੱਕ ਕਰਨ ਤੇ ਪੇਸ਼ਗੀ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "ਅਧਿਕਤਮ"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "ਕੇਂਦਰਿਤ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "ਮੇਨੂ"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "ਪਰਦੇ ਦੇ ਹਾਸ਼ੀਏ ਵਿੱਚ ਵਿੰਡੋ ਤਸਵਿਰ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "_ਅਧਿਕਤਮ"
+msgid "Snap windows to other _windows"
+msgstr "ਹੋਰ ਝਰੋਖਿਆਂ ਵਿੱਚ ਵਿੰਡੋ ਤਸਵੀਰ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "ਕਾਰਜ ਝਰੋਖੇ ਵਿੱਚ ਕਲਿੱਕ ਕਰਨ ਉਪਰੰਤ ਵਿੰਡੋ ਪੇਸ਼ ਕਰੋ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "ਛਾਂ"
+msgid "Dis_tance:"
+msgstr "ਅੰਤਰ:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "ਹੋਰ ਝਰੋਖਿਆਂ ਵਿੱਚ ਵਿੰਡੋ ਤਸਵੀਰ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "ਪਰਦੇ ਦੇ ਹਾਸ਼ੀਏ ਵਿੱਚ ਵਿੰਡੋ ਤਸਵਿਰ"
+msgid "<i>Small</i>"
+msgstr "ਛੋਟਾ"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "ਚਿਪਕਿਆ"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "ਚੌੜਾ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "ਸਿਰਲੇਖ ਪੱਟੀ ਉੱਪਰ ਡਬਲ ਕਲਿੱਕ ਕਰਨ ਤੇ ਵਾਪਰਨ ਵਾਲੀ ਕਿਰਿਆ ਃ"
+msgid "<b>Windows snapping</b>"
+msgstr "ਵਿੰਡੋ ਤਸਵੀਰ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "ਵਿੰਡੋ ਸਿਰਲੇਖ, ਇਹ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "ਸੰਕੇਤਕ ਪਰਦੇ ਦੇ ਕਿਨਾਰੇ ਤੇ ਪਹੁੰਚਣ ਉਪਰੰਤ ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "ਸਿਰਲੇਖ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "ਪਰਦਾ ਖਿੱਚਣ ਨਾਲ ਪਰਦਾ ਬੰਦ ਹੋਣ ਉਪਰੰਤ ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "ਕਿਨਾਰਾ ਵਿਰੋਧਤਾ ਃ"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "ਸੰਕੇਤਕ ਪਰਦੇ ਦੇ ਕਿਨਾਰੇ ਤੇ ਪਹੁੰਚਣ ਉਪਰੰਤ ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
+msgid "Hide content of windows when _resizing"
+msgstr "ਮੁੜ ਆਕਾਰ ਦੇਣ ਉਪਰੰਤ ਝਰੋਖੇ ਦੇ ਸੰਖੇਪ ਵਿਖਾਓ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "ਕੇਂਦ੍ਰਿਤ ਵਿੰਡੋ ਪੇਸ਼ਗੀ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤਰਾਲ ਃ"
+msgid "Hide content of windows when _moving"
+msgstr "ਹਿਲਾਉਣ ਉਪਰੰਤ ਝਰੋਖੇ ਦੇ ਸੰਖੇਪ ਵਿਖਾਓ+-"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "ਕਿਨਾਰਾ ਵਿਰੋਧਤਾ ਃ"
+msgid "<b>Box move and resize</b>"
+msgstr "ਅਪਾਰਦਰਸ਼ੀ ਹਿਲਾਉਣ ਅਤੇ ਮੁੜ ਆਕਾਰ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "ਕੇਂਦਰਿਤ"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "ਸਿਰਲੇਖ ਪੱਟੀ ਉੱਪਰ ਡਬਲ ਕਲਿੱਕ ਕਰਨ ਤੇ ਵਾਪਰਨ ਵਾਲੀ ਕਿਰਿਆ ਃ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "ਕਿਰਿਆ ਤੇ ਡਬਲ ਕਲਿੱਕ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "ਸ਼ੈਲੀ"
+msgid "Ad_vanced"
+msgstr "ਤਕਨੀਕੀ"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -735,54 +734,55 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "ਵੱਡਾ"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "ਵਿੰਡੋ, ਜਿਨ੍ਹਾਂ ਲਈ \"ਪੇਜ਼ਰ ਛੱਡੋ\" ਜਾਂ \"ਟਾਸਕ-ਬਾਰ ਛੱਡੋ\" ਪ੍ਰਾਪਰਟੀ ਸੈੱਟ ਹੋਵੇ, ਛੱਡੋ"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "ਧੁੰਦਲਾਪਨ"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "ਲੁਕਵੇਂ (ਆਈਕਾਨ ਬਣਾਇਆ ਸਮੇ) ਵਿੰਡੋ ਸਮੇਤ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "ਟਰਾਂਸਪੇਰਟ"
+msgid "Cycle _through windows on all workspaces"
+msgstr "ਸਭ ਵਰਕਸਪੇਸਾਂ ਤੋਂ ਵਿੰਡੋਂ ਨੂੰ ਸਾਇਕਲ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "ਫੋਕਸ ਸਟੀਲਿੰਗ ਬਚਾਅ ਸਰਗਰਮ"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "ਸਾਇਕਿੰਗ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "ਫੋਕਸ ਸਟੀਲਿੰਗ ਬਚਾਅ ਸਰਗਰਮ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "ਕੰਪੋਜ਼ਟੋਰ"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "ਸਟੈਂਡਰਡ ICCCM ਫੋਕਸ ਹਿੰਟ ਦਾ ਹਾਨਰ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "ਸਾਇਕਿੰਗ"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "ਸਭ ਵਰਕਸਪੇਸਾਂ ਤੋਂ ਵਿੰਡੋਂ ਨੂੰ ਸਾਇਕਲ ਕਰੋ"
+msgid "_Bring window on current workspace"
+msgstr "ਵਿੰਡੋ ਅਗਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਆਓ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "ਵਿੰਡੋ ਓਵਰਲੇਅ ਪੂਰੀ ਸਕਰੀਨ ਲਈ ਸਿੱਧਾ ਵੇਖਾਓ"
+msgid "Switch to win_dow's workspace"
+msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -791,182 +791,189 @@ msgstr "ਕੁਝ ਨਹੀਂ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 #, fuzzy
-msgid "Hide _frame of windows when maximized"
-msgstr "ਜਦੋਂ ਵੱਧ ਤੋਂ ਵੱਧ ਹੋਵੇ ਤਾਂ ਵਿੰਡੋ ਫਰੇਮ ਓਹਲੇ"
+msgid "Key used to _grab and move windows:"
+msgstr "ਵਿੰਡੋ ਗਰਬ ਅਤੇ ਭੇਜਣ ਲਈ ਵਰਤ ਵਾਸਤੇ ਸਵਿੱਚ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "ਸਟੈਂਡਰਡ ICCCM ਫੋਕਸ ਹਿੰਟ ਦਾ ਹਾਨਰ ਕਰੋ"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "ਜਦੋਂ ਮਾਊਸ ਬਟਨ ਦਬਾਇਆ ਜਾਵੇ ਤਾਂ ਵਿੰਡੋ ਉਭਾਰੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr ""
+#, fuzzy
+msgid "Hide _frame of windows when maximized"
+msgstr "ਜਦੋਂ ਵੱਧ ਤੋਂ ਵੱਧ ਹੋਵੇ ਤਾਂ ਵਿੰਡੋ ਫਰੇਮ ਓਹਲੇ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "ਵਿੰਡੋ ਗਰਬ ਅਤੇ ਭੇਜਣ ਲਈ ਵਰਤ ਵਾਸਤੇ ਸਵਿੱਚ"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "ਭੇਜਣ ਦੌਰਾਨ ਵੱਧ ਤੋਂ ਵੱਧ ਵਿੰਡੋ ਦਾ ਅਸਲੀ ਆਕਾਰ ਰੀ-ਸਟੋਰ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ਵਿੰਡੋ ਸਨੈਪਿੰਗ ਦੀ ਬਜਾਏ ਕੋਨਾ ਰੈਜ਼ੀਡੈਨਸ ਵਰਤੋਂ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "ਵਿੰਡੋ ਸਜਾਵਟ ਦਾ ਧੁੰਦਲਾਪਨ"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "ਨਾ-ਸਰਗਰਮ ਵਿੰਡੋ ਦੀ ਧੁੰਦਲਾਪਨ"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਦਾ ਧੁੰਦਲਾਪਨ"
+msgid "_Accessibility"
+msgstr "ਅਸੈੱਸਬਲਟੀ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "ਹਿਲਾਉਣ ਦੌਰਾਨ ਵਿੰਡੋ ਦੀ ਧੁੰਦਲਾਪਨ"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "ਮੁੜ-ਆਕਾਰ ਕਰਨ ਦੌਰਾਨ ਵਿੰਡੋ ਦਾ ਧੁੰਦਲਾਪਨ"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "ਭੇਜਣ ਦੌਰਾਨ ਵੱਧ ਤੋਂ ਵੱਧ ਵਿੰਡੋ ਦਾ ਅਸਲੀ ਆਕਾਰ ਰੀ-ਸਟੋਰ ਕਰੋ"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"ਜਦੋਂ ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਰਾਹੀਂ ਵਰਕਸਪੇਸ ਬਦਲਿਆ ਜਾਵੇ ਤਾਂ ਪਿਛਲਾ ਵਰਕਸਪੇਸ ਯਾਦ ਰੱਖੋ ਅਤੇ ਰੀ-ਕਾਲ ਕਰੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "ਅਸਲ ਡਿਸਕਟਾਪ ਲੇ-ਆਉਟ ਮੁਤਾਬਕ ਵਰਕਸਪੇਸ ਸਮੇਟੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "ਨਿਯਮਤ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "ਜਦੋਂ ਪਹਿਲਾਂ ਜਾਂ ਆਖਰੀ ਵਰਕਸਪੇਸ ਆ ਜਾਵੇ ਤਾਂ ਵਰਕਸਪੇਸ ਸਮੇਟੋ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
+msgid "_Workspaces"
+msgstr "ਵਰਕਸਪੇਸ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "ਸੌਖੀ ਪਲੇਸਮਿੰਟ ਬਦਲਣ ਲਈ ਵਿੰਡੋ ਦਾ ਘੱਟੋ-ਘੱਟ ਆਕਾਰ"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ਵਿੰਡੋ ਸਨੈਪਿੰਗ ਦੀ ਬਜਾਏ ਕੋਨਾ ਰੈਜ਼ੀਡੈਨਸ ਵਰਤੋਂ"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "ਵੱਡਾ"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "ਅਸਲ ਡਿਸਕਟਾਪ ਲੇ-ਆਉਟ ਮੁਤਾਬਕ ਵਰਕਸਪੇਸ ਸਮੇਟੋ"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "ਜਦੋਂ ਪਹਿਲਾਂ ਜਾਂ ਆਖਰੀ ਵਰਕਸਪੇਸ ਆ ਜਾਵੇ ਤਾਂ ਵਰਕਸਪੇਸ ਸਮੇਟੋ"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "ਅਸੈੱਸਬਲਟੀ"
+msgid "_Placement"
+msgstr "ਪਲੇਸਮਿੰਟ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "ਵਿੰਡੋ ਅਗਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਆਓ"
+msgid "_Enable display compositing"
+msgstr "ਡਿਸਪਲੇਅ ਕੰਪੋਜ਼ੀਸ਼ਨ ਯੋਗ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "ਵਿੰਡੋ ਓਵਰਲੇਅ ਪੂਰੀ ਸਕਰੀਨ ਲਈ ਸਿੱਧਾ ਵੇਖਾਓ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "ਡਿਸਪਲੇਅ ਕੰਪੋਜ਼ੀਸ਼ਨ ਯੋਗ"
+msgid "Show shadows under _regular windows"
+msgstr "ਨਿਯਮਤ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "ਲੁਕਵੇਂ (ਆਈਕਾਨ ਬਣਾਇਆ ਸਮੇ) ਵਿੰਡੋ ਸਮੇਤ"
+msgid "Show shadows under _dock windows"
+msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਹੇਠ ਛਾਂ ਵੇਖਾਓ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "ਸੌਖੀ ਪਲੇਸਮਿੰਟ ਬਦਲਣ ਲਈ ਵਿੰਡੋ ਦਾ ਘੱਟੋ-ਘੱਟ ਆਕਾਰ"
+msgid "Opaci_ty of window decorations:"
+msgstr "ਵਿੰਡੋ ਸਜਾਵਟ ਦਾ ਧੁੰਦਲਾਪਨ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "ਪਲੇਸਮਿੰਟ"
+msgid "<i>Transparent</i>"
+msgstr "ਟਰਾਂਸਪੇਰਟ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "ਜਦੋਂ ਮਾਊਸ ਬਟਨ ਦਬਾਇਆ ਜਾਵੇ ਤਾਂ ਵਿੰਡੋ ਉਭਾਰੋ"
+msgid "<i>Opaque</i>"
+msgstr "ਧੁੰਦਲਾਪਨ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"ਜਦੋਂ ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਰਾਹੀਂ ਵਰਕਸਪੇਸ ਬਦਲਿਆ ਜਾਵੇ ਤਾਂ ਪਿਛਲਾ ਵਰਕਸਪੇਸ ਯਾਦ ਰੱਖੋ ਅਤੇ ਰੀ-ਕਾਲ ਕਰੋ"
+msgid "Opacity of _inactive windows:"
+msgstr "ਨਾ-ਸਰਗਰਮ ਵਿੰਡੋ ਦੀ ਧੁੰਦਲਾਪਨ"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "ਹਿਲਾਉਣ ਦੌਰਾਨ ਵਿੰਡੋ ਦੀ ਧੁੰਦਲਾਪਨ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "ਵਿੰਡੋ, ਜਿਨ੍ਹਾਂ ਲਈ \"ਪੇਜ਼ਰ ਛੱਡੋ\" ਜਾਂ \"ਟਾਸਕ-ਬਾਰ ਛੱਡੋ\" ਪ੍ਰਾਪਰਟੀ ਸੈੱਟ ਹੋਵੇ, ਛੱਡੋ"
+msgid "Opacity of windows during resi_ze:"
+msgstr "ਮੁੜ-ਆਕਾਰ ਕਰਨ ਦੌਰਾਨ ਵਿੰਡੋ ਦਾ ਧੁੰਦਲਾਪਨ"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "ਪੋਪ-ਅੱਪ ਵਿੰਡੋ ਦਾ ਧੁੰਦਲਾਪਨ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "ਵਰਕਸਪੇਸ"
+msgid "C_ompositor"
+msgstr "ਕੰਪੋਜ਼ਟੋਰ"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "ਮਾਰਜਨ"
+msgid "_Number of workspaces:"
+msgstr "ਅਖਾੜਿਆਂ ਦੀ ਗਿਣਤੀ:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
+msgid "Names"
+msgstr "ਨਾਂ:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "ਮਾਰਜਨ ਪਰਦੇ ਦੇ ਕਿਨਾਰਿਆਂ ਤੇ ਅਜਿਹੇ ਖੇਤਰ ਹਨ ਜਿੱਥੇ ਕੋਈ ਵਿੰਡੋ ਸਥਾਪਤ ਨਹੀਂ ਹੋਵੇਗਾ"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "ਅਖਾੜਿਆਂ ਦੀ ਗਿਣਤੀ:"
+msgid "_Margins"
+msgstr "ਮਾਰਜਨ"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -974,36 +981,36 @@ msgstr "ਅਖਾੜਿਆਂ ਦੀ ਗਿਣਤੀ:"
 msgid "%s (on %s)"
 msgstr "%s (%s ਉੱਤੇ)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Xfce 4 ਵਿੰਡੋ ਮੈਨੇਜਰ ਸੈਟਿੰਗ"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1147,6 +1154,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "ਅਖਾੜਿਆਂ ਦੀ ਗਿਣਤੀ:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "ਮਾਰਜਨ"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "ਵਰਕਸਪੇਸ ਲਪੇਟੋ"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "ਵਰਕਸਪੇਸ ਨਾਂ"
 
@@ -1363,10 +1382,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "ਨਾਂ-ਤਬਦੀਲ"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "ਨਾਂ:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "ਇਸ ਨੂੰ ਸੋਧਣ ਲਈ ਵਰਕਸਪੇਸ ਨਾਂ ਤੇ ਕਲਿੱਕ ਕਰੋ"
 
@@ -1384,10 +1399,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "ਵਰਕਸਪੇਸ ਤੇ ਮਾਰਜਨ"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "ਮਾਰਜਨ"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ ਸੈਟਿੰਗ"
 
diff --git a/po/pl.po b/po/pl.po
index bf0aef0..6da83ff 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,20 +6,21 @@
 # Robert Kurowski <koorek at o2.pl>, 2005.
 # Szymon Kałasz <szymon_maestro at gazeta.pl>, 2006.
 # Piotr Sokół <psokol at jabster.pl>, 2009, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-07 11:18+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-02-19 17:21+0100\n"
 "Last-Translator: Piotr Sokół <psokol at jabster.pl>\n"
 "Language-Team: Polish <>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20)) ? 1 : 2));\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -86,239 +87,239 @@ msgid "Settings manager socket"
 msgstr "Określa gniazdo menedżera ustawień"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfiguruje ustawienia okien i skróty klawiszowe"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Okna"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Konfiguruje ustawienia menedżera okien oraz efekty wizualne"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfiguruje ustawienia okien i skróty klawiszowe"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Menedżer okien"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Konfiguruje ilość oraz nazwy obszarów roboczych"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Konfiguruje ustawienia menedżera okien oraz efekty wizualne"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Obszary robocze"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Przemieszczanie i zmiana rozmiaru</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Układ przycisków</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Czynność dw_ukrotnego kliknięcia</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>M_otyw</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Metoda</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Czc_ionka tytułu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Nowe okna</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Wy_równanie tytułu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Czynność kliknięcia</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Aby zmienić układ, należy przeciągnąć przyciski w odpowienie pola."
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Czynność uaktywniania</b>"
+msgid "Title"
+msgstr "Tytuł"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Wy_równanie tytułu</b>"
+msgid "The window title cannot be removed"
+msgstr "Wyświetla tytuł okna. Tego elementu nie można usunąć."
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Czc_ionka tytułu</b>"
+msgid "Active"
+msgstr "Widoczne"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Sk_róty klawiszowe</b>"
+msgid "Menu"
+msgstr "Wyświetla menu okna"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Przyleganie</b>"
+msgid "Stick"
+msgstr "Wyświetla okno na wszystkich obszarach roboczych"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Obszary robocze</b>"
+msgid "Shade"
+msgstr "Ukrywa zawartość okna"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>M_otyw</b>"
+msgid "Minimize"
+msgstr "Zminimalizuj"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksymalizuje rozmiar okna"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Długie</i>"
+msgid "Close"
+msgstr "Zamyka okno"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ukryte"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Krótkie</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Układ przycisków</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "Wyg_ląd"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Mały</i>"
+msgid "_Reset to Defaults"
+msgstr "Przywróć _domyślne"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Sk_róty klawiszowe</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Duży</i>"
+msgid "Ke_yboard"
+msgstr "_Klawiatura"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Widoczne"
+msgid "Clic_k to focus"
+msgstr "Uaktywnianie k_liknięciem"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Z_aawansowane"
+msgid "Focus follows _mouse"
+msgstr "Uaktywnianie ku_rsorem myszy"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Przemieszczanie na w_ierzch uaktywnionych okien"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Uaktywnianie _nowo utworzonych okien"
+msgid "_Delay before window receives focus:"
+msgstr "_Opóźnienie uaktywniania okien:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Uaktywnianie k_liknięciem"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Aby zmienić układ, należy przeciągnąć przyciski w odpowienie pola."
+msgid "<i>Short</i>"
+msgstr "<i>Krótkie</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Zamyka okno"
+msgid "<i>Long</i>"
+msgstr "<i>Długie</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Metoda</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "_Opóźnienie przemieszczania na wierzch uaktywnionych okien:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Uaktywnianie _nowo utworzonych okien"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "O_dstęp:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Nowe okna</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Uaktywnianie ku_rsorem myszy"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Przemieszczanie na w_ierzch uaktywnionych okien"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ukryte"
+msgid "Delay _before raising focused window:"
+msgstr "_Opóźnienie przemieszczania na wierzch uaktywnionych okien:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ukrywanie zawartości okien podczas przemie_szczania"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Czynność uaktywniania</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ukrywanie zawartości okien podczas zmiany wie_lkości"
+msgid "Raise window when clicking _inside application window"
+msgstr "Przemieszczanie okien na wierzch po kliknięciu w ich zawar_tość"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Klawiatura"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Czynność kliknięcia</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksymalizuje rozmiar okna"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Uaktywnianie"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Wyświetla menu okna"
+msgid "Snap windows to screen _border"
+msgstr "Przyleganie krawędzi okien do krawędzi _ekranu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Zminimalizuj"
+msgid "Snap windows to other _windows"
+msgstr "Przyleganie krawędzi okien do krawędzi innych ok_ien"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Przemieszczanie okien na wierzch po kliknięciu w ich zawar_tość"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Ukrywa zawartość okna"
+msgid "Dis_tance:"
+msgstr "O_dstęp:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Przyleganie krawędzi okien do krawędzi innych ok_ien"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Przyleganie krawędzi okien do krawędzi _ekranu"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Mały</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Wyświetla okno na wszystkich obszarach roboczych"
+msgid "<i>Wide</i>"
+msgstr "<i>Duży</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr ""
-"Określa czynność wykonywaną po podwójnym kliknięciu na pasku tytułowym okna"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Przyleganie</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Wyświetla tytuł okna. Tego elementu nie można usunąć."
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Przełączanie podczas przemieszczania k_ursora myszy poza krawędź ekranu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Tytuł"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Przełączanie podczas przemieszczania _okna poza krawędź ekranu"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Opór k_rawędzi:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Obszary robocze</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Przełączanie podczas przemieszczania k_ursora myszy poza krawędź ekranu"
+msgid "Hide content of windows when _resizing"
+msgstr "Ukrywanie zawartości okien podczas zmiany wie_lkości"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Opóźnienie uaktywniania okien:"
+msgid "Hide content of windows when _moving"
+msgstr "Ukrywanie zawartości okien podczas przemie_szczania"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Opór k_rawędzi:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Przemieszczanie i zmiana rozmiaru</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Uaktywnianie"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr ""
+"Określa czynność wykonywaną po podwójnym kliknięciu na pasku tytułowym okna"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Przywróć _domyślne"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Czynność dw_ukrotnego kliknięcia</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "Wyg_ląd"
+msgid "Ad_vanced"
+msgstr "Z_aawansowane"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -658,207 +659,217 @@ msgid ""
 "do this?"
 msgstr "Przywrócić wartości domyślne wszystkich skrótów klawiszowych?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Duży</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Brak</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Pom_ijanie okien ukrytych na liście zadań lub podglądzie obszarów roboczych"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Uw_zględnianie ukrytych okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Całkowita</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Uwzględnianie okien ze w_szystkich obszarów roboczych"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Zapobieganie u_tracie uaktywnienia okna"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "Wyświetlanie o_bramowania zaznaczonego okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Na ś_rodku ekranu"
+msgid "C_ycling"
+msgstr "_Przełączanie pomiędzy oknami"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Domyślne położenie okna:"
+msgid "Activate _focus stealing prevention"
+msgstr "Zapobieganie u_tracie uaktywnienia okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Kompozycje"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Uznawanie _standardu ICCCM uaktywniania okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Przełączanie pomiędzy oknami"
+msgid "When a window raises itself:"
+msgstr "Czynność wykonywana po automatycznym przemieszczeniu okna na wierzch:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Uwzględnianie okien ze w_szystkich obszarów roboczych"
+msgid "_Bring window on current workspace"
+msgstr "Prz_emieszczenie okna na bieżący obszar roboczy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Bezpośrednie wyświetlanie okien na p_ełnym ekranie"
+msgid "Switch to win_dow's workspace"
+msgstr "Przełączenie na obszar roboczy ok_na"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Brak"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ukrywanie o_bramowań zmaksymalizowanych okien"
+msgid "Key used to _grab and move windows:"
+msgstr "Klawisz służący do c_hwytania i przemieszczania okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Uznawanie _standardu ICCCM uaktywniania okien"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr ""
+"Prz_enoszenie na wierzch okien po kliknięciu w ich zawartość dowolnym "
+"przyciskiem myszy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Pow_tarzające się miganie"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ukrywanie o_bramowań zmaksymalizowanych okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Klawisz służący do c_hwytania i przemieszczania okien:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Przywracanie pierwotnego rozm_iaru zmaksymalizowanego okna podczas "
+"przemieszczania"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Powiadamianie o pi_lności okien migającym obramowaniem"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Używanie oporu k_rawędzi zamiast przylegania okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Przezroczystość deko_racji okien:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Powiadamianie o pi_lności okien migającym obramowaniem"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Przezroczystość _nieaktywnych okien:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Pow_tarzające się miganie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Przezroczys_tość powiadomień:"
+msgid "_Accessibility"
+msgstr "_Dostępność"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Przezroczystość okien podczas przemie_szczania:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Zmienianie obszaru roboczego przy użyciu kółka my_szy na pulpicie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Przezroczystość okien podczas zmieniania rozmiar_u:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Przywracanie pierwotnego rozm_iaru zmaksymalizowanego okna podczas "
-"przemieszczania"
+"Z_apamiętywanie i przywracanie poprzedniego obszaru roboczego\n"
+"podczas przełączania za pomocą skrótów klawiszowych"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Cienie zadokow_anych okien"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Przełączanie pomiędzy obszarami roboczymi uwzględniając ich u_kład"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Cienie zwykłyc_h okien"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Przełączanie pomiędzy k_rańcowymi obszarami roboczymi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Cienie pow_iadomień"
+msgid "_Workspaces"
+msgstr "Obszary _robocze"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Przełączenie na obszar roboczy ok_na"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "W położeniu wyświetlania _kursora myszy"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Używanie oporu k_rawędzi zamiast przylegania okien"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Zmienianie obszaru roboczego przy użyciu kółka my_szy na pulpicie"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr ""
+"M_inimalny rozmiar okna potrzebny do włączenia inteligentnego rozmieszczania:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Czynność wykonywana po automatycznym przemieszczeniu okna na wierzch:"
+msgid "<i>Large</i>"
+msgstr "<i>Duży</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Domyślne położenie okna:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Przełączanie pomiędzy obszarami roboczymi uwzględniając ich u_kład"
+msgid "At the _center of the screen"
+msgstr "Na ś_rodku ekranu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Przełączanie pomiędzy k_rańcowymi obszarami roboczymi"
+msgid "Under the mouse _pointer"
+msgstr "W położeniu wyświetlania _kursora myszy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Dostępność"
+msgid "_Placement"
+msgstr "P_ołożenie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Prz_emieszczenie okna na bieżący obszar roboczy"
+msgid "_Enable display compositing"
+msgstr "Włącz_enie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "Wyświetlanie o_bramowania zaznaczonego okna"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Bezpośrednie wyświetlanie okien na p_ełnym ekranie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Włącz_enie"
+msgid "Show shadows under _regular windows"
+msgstr "Cienie zwykłyc_h okien"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Cienie pow_iadomień"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Uw_zględnianie ukrytych okien"
+msgid "Show shadows under _dock windows"
+msgstr "Cienie zadokow_anych okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
-"M_inimalny rozmiar okna potrzebny do włączenia inteligentnego rozmieszczania:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Przezroczystość deko_racji okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "P_ołożenie"
+msgid "<i>Transparent</i>"
+msgstr "<i>Całkowita</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr ""
-"Prz_enoszenie na wierzch okien po kliknięciu w ich zawartość dowolnym "
-"przyciskiem myszy"
+msgid "<i>Opaque</i>"
+msgstr "<i>Brak</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Z_apamiętywanie i przywracanie poprzedniego obszaru roboczego\n"
-"podczas przełączania za pomocą skrótów klawiszowych"
+msgid "Opacity of _inactive windows:"
+msgstr "Przezroczystość _nieaktywnych okien:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Przezroczystość okien podczas przemie_szczania:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Pom_ijanie okien ukrytych na liście zadań lub podglądzie obszarów roboczych"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Przezroczystość okien podczas zmieniania rozmiar_u:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Przezroczys_tość powiadomień:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Obszary _robocze"
+msgid "C_ompositor"
+msgstr "_Kompozycje"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marginesy</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Ilość:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Obszary robocze</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nazwa:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Marginesy to obszary ekranu, na których nie są umieszczane okna."
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Ilość:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Marginesy"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1027,6 +1038,15 @@ msgstr "Wystąpił błąd podczas wczytywania danych procesu podrzędnego: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nie można zapoczątkować helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Konfiguruje ilość oraz nazwy obszarów roboczych"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Marginesy</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Obszary robocze</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Zmień nazwę obszaru roboczego"
 
@@ -1194,9 +1214,6 @@ msgstr "Nie można zapoczątkować helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Zmień nazwę"
 
-#~ msgid "Name:"
-#~ msgstr "Nazwa:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Kliknij na nazwie obszaru roboczego aby ją zmienić"
 
@@ -1212,9 +1229,6 @@ msgstr "Nie można zapoczątkować helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Obszary robocze i marginesy"
 
-#~ msgid "Margins"
-#~ msgstr "Marginesy"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Ustawienia Menadżera Okien"
 
diff --git a/po/pt.po b/po/pt.po
index bb8b04e..7551c2a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-03-08 22:48+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
 
@@ -84,237 +84,237 @@ msgid "Settings manager socket"
 msgstr "\"Socket\" do gestor de definições"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configurar comportamento e atalhos das janelas"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gestor de janelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Configurar comportamento e efeitos das janelas"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configurar comportamento e atalhos das janelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ajustes do gestor de janelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Definir número e nomes das áreas de trabalho"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Configurar comportamento e efeitos das janelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Áreas de trabalho"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Mover e redimensionar</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Esquema dos botões</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Ação do d_uplo clique</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modelo de foco</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Tipo de let_ra do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Foco em novas janelas</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Alinha_mento do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Levantar com clique</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Clique e arraste os botões para mudar o esquema"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Levantar ao focar</b>"
+msgid "Title"
+msgstr "Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Alinha_mento do título</b>"
+msgid "The window title cannot be removed"
+msgstr "O título da janela não pode ser removido"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Tipo de let_ra do título</b>"
+msgid "Active"
+msgstr "Ativo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Atalho_s de janela</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Alinhamento de janelas</b>"
+msgid "Stick"
+msgstr "Prender"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Mudança de áreas de trabalho</b>"
+msgid "Shade"
+msgstr "Enrolar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Longo</i>"
+msgid "Close"
+msgstr "Fechar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Oculto"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Curto</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Esquema dos botões</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Estilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Pequeno</i>"
+msgid "_Reset to Defaults"
+msgstr "_Repor omissões"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Atalho_s de janela</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Grande</i>"
+msgid "Ke_yboard"
+msgstr "Tec_lado"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Ativo"
+msgid "Clic_k to focus"
+msgstr "C_lique para focar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vançado"
+msgid "Focus follows _mouse"
+msgstr "Foco segue o _rato"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Subir janelas automaticamente quando recebem foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Focar automaticamente as _novas janelas criadas"
+msgid "_Delay before window receives focus:"
+msgstr "Atraso antes _da janela receber foco:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "C_lique para focar"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Clique e arraste os botões para mudar o esquema"
+msgid "<i>Short</i>"
+msgstr "<i>Curto</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Fechar"
+msgid "<i>Long</i>"
+msgstr "<i>Longo</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modelo de foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Atraso antes de su_bir a janela focada:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Focar automaticamente as _novas janelas criadas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tância:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Foco em novas janelas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Foco segue o _rato"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Subir janelas automaticamente quando recebem foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Oculto"
+msgid "Delay _before raising focused window:"
+msgstr "Atraso antes de su_bir a janela focada:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ocultar conteúdo das janelas ao _mover"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Levantar ao focar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ocultar conteúdo das janelas ao _redimensionar"
+msgid "Raise window when clicking _inside application window"
+msgstr "Trazer janela para a frente ao _clicar na janela da aplicação"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Tec_lado"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Levantar com clique</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "F_oco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Alinhar janelas ao limite do e_crã"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimizar"
+msgid "Snap windows to other _windows"
+msgstr "Alinhar janelas com outras ja_nelas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Trazer janela para a frente ao _clicar na janela da aplicação"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrolar"
+msgid "Dis_tance:"
+msgstr "Dis_tância:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Alinhar janelas com outras ja_nelas"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Alinhar janelas ao limite do e_crã"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Pequeno</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Prender"
+msgid "<i>Wide</i>"
+msgstr "<i>Grande</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "A ação a executar ao clicar duas vezes na barra de título"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Alinhamento de janelas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "O título da janela não pode ser removido"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Mudar de área de trabalho se o _ponteiro atingir o limite do ecrã"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Título"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Mu_dar de área de trabalho ao arrastar uma janela para fora do ecrã"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "R_esistência do limite:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Mudança de áreas de trabalho</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Mudar de área de trabalho se o _ponteiro atingir o limite do ecrã"
+msgid "Hide content of windows when _resizing"
+msgstr "Ocultar conteúdo das janelas ao _redimensionar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Atraso antes _da janela receber foco:"
+msgid "Hide content of windows when _moving"
+msgstr "Ocultar conteúdo das janelas ao _mover"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "R_esistência do limite:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Mover e redimensionar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "F_oco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "A ação a executar ao clicar duas vezes na barra de título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Repor omissões"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Ação do d_uplo clique</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Estilo"
+msgid "Ad_vanced"
+msgstr "A_vançado"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -645,205 +645,222 @@ msgid "Reset to Defaults"
 msgstr "Repor omissões"
 
 #: ../settings-dialogs/xfwm4-settings.c:1893
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr "Vai repor todos os atalhos para os seus valores originais. Continuar?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Largo</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaco</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Ig_norar janelas que tenham \"ignorar paginador\"\n"
+"ou \"ignorar barra de tarefas\" nas propriedades"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Incluir janelas ocultas (i.e. minimizadas) "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Pe_rcorrer janelas de todas as áreas de trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Ati_var foco retirando a prevenção"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Desenhar moldura das janelas selecionadas ao percorrer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "No ce_ntro do ecrã"
+msgid "C_ycling"
+msgstr "P_ercorrer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Por omissão, colocar janelas:"
+msgid "Activate _focus stealing prevention"
+msgstr "Ati_var foco retirando a prevenção"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Compositor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Re_speitar o padrão de foco ICCCM "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "P_ercorrer"
+msgid "When a window raises itself:"
+msgstr "Quando uma janela se levanta:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Pe_rcorrer janelas de todas as áreas de trabalho"
+msgid "_Bring window on current workspace"
+msgstr "Tra_zer janela para a área de trabalho atual"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "O ecrã completo cobre as ja_nelas"
+msgid "Switch to win_dow's workspace"
+msgstr "Mu_dar para a área de trabalho da janela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Nada fazer"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ocultar _moldura das janelas maximizadas"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla usada para a_garrar e mover janelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Re_speitar o padrão de foco ICCCM "
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Subi_r janelas ao pressionar qualquer botão do rato"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Manter janelas urgentes a pi_scar repetidamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ocultar _moldura das janelas maximizadas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla usada para a_garrar e mover janelas:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Ao mover, restaurar taman_ho original das janelas maximizadas "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Avisar da _urgência fazendo piscar a decoração da janela"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Utilizar r_esistência de limites ao invés do alinhamento de janelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opac_idade das decorações de janela:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Avisar da _urgência fazendo piscar a decoração da janela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacidade das janelas inati_vas:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Manter janelas urgentes a pi_scar repetidamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacidade das janela_s de contexto:"
+msgid "_Accessibility"
+msgstr "Acessi_bilidade"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacidade das janelas em _movimento:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "_Utilizar roda do rato para trocar entre áreas de trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacidade das janelas ao redi_mensionar"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Ao mover, restaurar taman_ho original das janelas maximizadas "
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Memorizar e _restaurar área de trabalho anterior\n"
+"quando se troca pelos atalhos de teclado"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostrar sombras por baixo das janelas acopla_das"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Trocar de áreas _de trabalho de acordo com o esquema do ambiente de trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostrar somb_ras por baixo das janelas normais"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Trocar de áreas de trabalho se a primeira ou a última área de trabal_ho for "
+"atingida"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostrar sombras por baixo das janelas de conte_xto"
+msgid "_Workspaces"
+msgstr "Áreas de _trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Mu_dar para a área de trabalho da janela"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Por bai_xo do ponteiro do rato"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Utilizar r_esistência de limites ao invés do alinhamento de janelas"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "_Utilizar roda do rato para trocar entre áreas de trabalho"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Tamanho _mínimo das janelas para posicionamento inteligente:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Quando uma janela se levanta:"
+msgid "<i>Large</i>"
+msgstr "<i>Largo</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Por omissão, colocar janelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Trocar de áreas _de trabalho de acordo com o esquema do ambiente de trabalho"
+msgid "At the _center of the screen"
+msgstr "No ce_ntro do ecrã"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Trocar de áreas de trabalho se a primeira ou a última área de trabal_ho for atingida"
+msgid "Under the mouse _pointer"
+msgstr "Por bai_xo do ponteiro do rato"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Acessi_bilidade"
+msgid "_Placement"
+msgstr "_Posicionamento"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Tra_zer janela para a área de trabalho atual"
+msgid "_Enable display compositing"
+msgstr "_Ligar composição de ecrã"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Desenhar moldura das janelas selecionadas ao percorrer"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "O ecrã completo cobre as ja_nelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Ligar composição de ecrã"
+msgid "Show shadows under _regular windows"
+msgstr "Mostrar somb_ras por baixo das janelas normais"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostrar sombras por baixo das janelas de conte_xto"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Incluir janelas ocultas (i.e. minimizadas) "
+msgid "Show shadows under _dock windows"
+msgstr "Mostrar sombras por baixo das janelas acopla_das"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Tamanho _mínimo das janelas para posicionamento inteligente:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opac_idade das decorações de janela:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Posicionamento"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Subi_r janelas ao pressionar qualquer botão do rato"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaco</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Memorizar e _restaurar área de trabalho anterior\n"
-"quando se troca pelos atalhos de teclado"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacidade das janelas inati_vas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacidade das janelas em _movimento:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Ig_norar janelas que tenham \"ignorar paginador\"\n"
-"ou \"ignorar barra de tarefas\" nas propriedades"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacidade das janelas ao redi_mensionar"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacidade das janela_s de contexto:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Áreas de _trabalho"
+msgid "C_ompositor"
+msgstr "_Compositor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margens</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Número de áreas de trabalho:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Áreas de trabalho</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-msgid "Margins are areas on the edges of the screen where no window will be placed"
-msgstr "As margens são as áreas nos limites do ecrã onde nenhuma janela será colocada"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nome:"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Número de áreas de trabalho:"
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
+msgid ""
+"Margins are areas on the edges of the screen where no window will be placed"
+msgstr ""
+"As margens são as áreas nos limites do ecrã onde nenhuma janela será colocada"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margens</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -851,35 +868,35 @@ msgstr "_Número de áreas de trabalho:"
 msgid "%s (on %s)"
 msgstr "%s (em %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Enviar para segundo plano"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Enviar para segundo plano (não suportado)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Definir modo de composição"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Definir modo de composição (não suportado)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Substituir o gestor de janelas existente"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Mostra as informações da versão e sai"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTOS...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Digite \"%s --help\" para instruções de utilização"
@@ -1011,12 +1028,17 @@ msgstr "Erro ao ler dados do processo filho: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Incapaz de criar helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Definir número e nomes das áreas de trabalho"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Áreas de trabalho</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Mudar nome da área de trabalho"
-#~ msgid "_Name:"
-#~ msgstr "_Nome:"
+
 #~ msgid "Hide"
 #~ msgstr "Ocultar"
+
 #~ msgid "%s: Segmentation fault"
 #~ msgstr "%s: Falha de segmentação"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fb8d6dc..e67e45e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,19 +7,19 @@
 # Fábio Nogueira <deb-user-ba at ubuntu.com>, 2008.
 # Vladimir Melo <vmelo at gnome.org>, 2008.
 # Sérgio Cipolla <secipolla at gmail.com> 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 22:18+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-05-01 06:49-0300\n"
 "Last-Translator: Sérgio Cipolla <secipolla at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -87,238 +87,238 @@ msgid "Settings manager socket"
 msgstr "Socket do gerenciador de configurações"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Configure o comportamento e atalhos das janelas"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Gerenciador de Janelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Ajustes finos do comportamento e efeitos das janelas"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configure o comportamento e atalhos das janelas"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ajustes do Gerenciador de Janelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Define o número e os nomes dos espaços de trabalho"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Ajustes finos do comportamento e efeitos das janelas"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Espaços de trabalho"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Movimentação e dimensionamento de caixa</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Disposição de botões</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Ação de clique duplo</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Modelo de foco</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Fo_nte do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Foco das janelas novas</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Alinhamento do título</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Levantar ao clicar</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Clicar e arrastar os botões para alterar a disposição"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Levantar ao receber foco</b>"
+msgid "Title"
+msgstr "Título"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Alinhamento do título</b>"
+msgid "The window title cannot be removed"
+msgstr "O título da janela não pode ser removido"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Fo_nte do título</b>"
+msgid "Active"
+msgstr "Ativos"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Atalhos de _janela</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Alinhamento automático de janelas</b>"
+msgid "Stick"
+msgstr "Fixar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Envolver espaços de trabalho</b>"
+msgid "Shade"
+msgstr "Enrolar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Mi_nimizar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizar"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Longo</i>"
+msgid "Close"
+msgstr "Fechar"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ocultos"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Curto</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Disposição de botões</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "E_stilo"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Pequena</i>"
+msgid "_Reset to Defaults"
+msgstr "_Restaurar para padrões"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Atalhos de _janela</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Grande</i>"
+msgid "Ke_yboard"
+msgstr "Tecla_do"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Ativos"
+msgid "Clic_k to focus"
+msgstr "Foco ao _clicar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vançado"
+msgid "Focus follows _mouse"
+msgstr "Foco segue o _mouse"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Levanta_r automaticamente janelas quando receberem foco"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Dar automaticamente foco às janelas _novas"
+msgid "_Delay before window receives focus:"
+msgstr "A_traso antes de focalizar a janela:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Foco ao _clicar"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Clicar e arrastar os botões para alterar a disposição"
+msgid "<i>Short</i>"
+msgstr "<i>Curto</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Fechar"
+msgid "<i>Long</i>"
+msgstr "<i>Longo</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Modelo de foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Atraso an_tes de levantar a janela com foco:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Dar automaticamente foco às janelas _novas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Dis_tância:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Foco das janelas novas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Foco segue o _mouse"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Levanta_r automaticamente janelas quando receberem foco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ocultos"
+msgid "Delay _before raising focused window:"
+msgstr "Atraso an_tes de levantar a janela com foco:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ocultar conteúdo das janelas ao _mover"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Levantar ao receber foco</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ocultar conteúdo das janelas ao _redimensionar"
+msgid "Raise window when clicking _inside application window"
+msgstr "Levantar a janela ao cl_icar dentro da janela do aplicativo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Tecla_do"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Levantar ao clicar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "F_oco"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Alinhar automaticamente janelas na _borda da tela"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Mi_nimizar"
+msgid "Snap windows to other _windows"
+msgstr "Alinhar automaticamente janelas com outras _janelas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Levantar a janela ao cl_icar dentro da janela do aplicativo"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Enrolar"
+msgid "Dis_tance:"
+msgstr "Dis_tância:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Alinhar automaticamente janelas com outras _janelas"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Alinhar automaticamente janelas na _borda da tela"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Pequena</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Fixar"
+msgid "<i>Wide</i>"
+msgstr "<i>Grande</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Ação a executar quando houver clique duplo na barra de títulos"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Alinhamento automático de janelas</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "O título da janela não pode ser removido"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"Mudar de espaço de trabalho quando o _ponteiro alcançar a borda da tela"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Título"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Mudar de espaço de trabalho ao arrastar uma janela para fora da te_la"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "R_esistência das bordas:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Envolver espaços de trabalho</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Mudar de espaço de trabalho quando o _ponteiro alcançar a borda da tela"
+msgid "Hide content of windows when _resizing"
+msgstr "Ocultar conteúdo das janelas ao _redimensionar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "A_traso antes de focalizar a janela:"
+msgid "Hide content of windows when _moving"
+msgstr "Ocultar conteúdo das janelas ao _mover"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "R_esistência das bordas:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Movimentação e dimensionamento de caixa</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "F_oco"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Ação a executar quando houver clique duplo na barra de títulos"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Restaurar para padrões"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Ação de clique duplo</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "E_stilo"
+msgid "Ad_vanced"
+msgstr "A_vançado"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -656,209 +656,219 @@ msgstr ""
 "Isto restaurará todos os atalhos aos seus valores padrão. Você realmente "
 "deseja fazer isso?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Grande</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opaco</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"I_gnorar as janelas que têm as propriedades \"ignorar paginador\" ou "
+"\"ignorar barra de tarefas\" definidas"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Incluir janelas ocultas (minimizadas)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Circular pelas janelas de todos os espaços de _trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Ativar prevenção de _roubo de foco"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Desenhar quadro em torno das janelas selecionadas ao circular"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "No _centro do monitor"
+msgid "C_ycling"
+msgstr "Circ_ulação"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Por padrão, posicionar janelas:"
+msgid "Activate _focus stealing prevention"
+msgstr "Ativar prevenção de _roubo de foco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "Compo_sitor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "_Honrar o padrão ICCCM para dica de foco"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Circ_ulação"
+msgid "When a window raises itself:"
+msgstr "Quando uma janela for levantada automaticamente:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Circular pelas janelas de todos os espaços de _trabalho"
+msgid "_Bring window on current workspace"
+msgstr "_Trazer a janela para o espaço de trabalho atual"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Exibir tela cheia diretamente so_breposta às janelas"
+msgid "Switch to win_dow's workspace"
+msgstr "Mudar para o espaço de trabalho _da janela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Não fazer _nada"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ocultar _bordas das janelas quando maximizadas"
+msgid "Key used to _grab and move windows:"
+msgstr "Tecla usada para _capturar e mover janelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "_Honrar o padrão ICCCM para dica de foco"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Levanta_r janelas quando qualquer botão do mouse for pressionado"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Manter janelas de urgência _piscando repetidamente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ocultar _bordas das janelas quando maximizadas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tecla usada para _capturar e mover janelas:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Restaurar o tamanho original das janelas _maximizadas ao movê-las"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notificar sobre ur_gências piscando a decoração da janela"
+msgid "Use _edge resistance instead of window snapping"
+msgstr ""
+"Usar resis_tência de bordas em vez de alinhamento automático de janelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opacidade da decoração das _janelas:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notificar sobre ur_gências piscando a decoração da janela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacidade das janelas _inativas:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Manter janelas de urgência _piscando repetidamente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacidade das janelas de con_texto:"
+msgid "_Accessibility"
+msgstr "_Acessibilidade"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacidade das janelas ao _mover:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Usar a roda do _mouse sobre a área de trabalho para alternar os espaços de "
+"trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opa_cidade das janelas ao redimensionar:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Restaurar o tamanho original das janelas _maximizadas ao movê-las"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Lembra_r e retornar ao espaço de trabalho anterior ao mudar através dos "
+"atalhos de teclado"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Mostrar sombras sob janelas _de doca"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Envolver o primeiro e o último espaço de traba_lho ao arrastar janela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Mostrar sombras sob janelas no_rmais"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Envolver o primeiro e o úl_timo espaço de trabalho ao alternar com a roda do "
+"mouse"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Mostrar sombras sob janelas de conte_xto"
+msgid "_Workspaces"
+msgstr "_Espaços de trabalho"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Mudar para o espaço de trabalho _da janela"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sob o ponteiro do _mouse"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr ""
-"Usar resis_tência de bordas em vez de alinhamento automático de janelas"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Usar a roda do _mouse sobre a área de trabalho para alternar os espaços de "
-"trabalho"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Tamanho _mínimo das janelas para acionar o posicionamento inteligente:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Quando uma janela for levantada automaticamente:"
+msgid "<i>Large</i>"
+msgstr "<i>Grande</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Por padrão, posicionar janelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Envolver o primeiro e o último espaço de traba_lho ao arrastar janela"
+msgid "At the _center of the screen"
+msgstr "No _centro do monitor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Envolver o primeiro e o úl_timo espaço de trabalho ao alternar com a roda do "
-"mouse"
+msgid "Under the mouse _pointer"
+msgstr "Sob o ponteiro do _mouse"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Acessibilidade"
+msgid "_Placement"
+msgstr "_Posicionamento"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Trazer a janela para o espaço de trabalho atual"
+msgid "_Enable display compositing"
+msgstr "_Habilitar composição de tela"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Desenhar quadro em torno das janelas selecionadas ao circular"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Exibir tela cheia diretamente so_breposta às janelas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Habilitar composição de tela"
+msgid "Show shadows under _regular windows"
+msgstr "Mostrar sombras sob janelas no_rmais"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Mostrar sombras sob janelas de conte_xto"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Incluir janelas ocultas (minimizadas)"
+msgid "Show shadows under _dock windows"
+msgstr "Mostrar sombras sob janelas _de doca"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Tamanho _mínimo das janelas para acionar o posicionamento inteligente:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opacidade da decoração das _janelas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Posicionamento"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Levanta_r janelas quando qualquer botão do mouse for pressionado"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opaco</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Lembra_r e retornar ao espaço de trabalho anterior ao mudar através dos "
-"atalhos de teclado"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacidade das janelas _inativas:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacidade das janelas ao _mover:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"I_gnorar as janelas que têm as propriedades \"ignorar paginador\" ou "
-"\"ignorar barra de tarefas\" definidas"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opa_cidade das janelas ao redimensionar:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacidade das janelas de con_texto:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Espaços de trabalho"
+msgid "C_ompositor"
+msgstr "Compo_sitor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margens</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Número de espaços de trabalho:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Espaços de trabalho</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Nome:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margens são áreas nas bordas da tela onde nenhuma janela será posicionada"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Número de espaços de trabalho:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Margens"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1028,6 +1038,15 @@ msgstr "Erro ao ler dados do processo filho: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Não é possível criar o helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Define o número e os nomes dos espaços de trabalho"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Margens</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Espaços de trabalho</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Alterar nome do espaço de trabalho"
 
@@ -1223,9 +1242,6 @@ msgstr "Não é possível criar o helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Mudar nome"
 
-#~ msgid "Name:"
-#~ msgstr "Nome:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Clique no nome de um espaço de trabalho para editá-lo"
 
@@ -1241,9 +1257,6 @@ msgstr "Não é possível criar o helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Espaços de trabalho e Margens"
 
-#~ msgid "Margins"
-#~ msgstr "Margens"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Configurações do Gerenciador de Janelas"
 
diff --git a/po/ro.po b/po/ro.po
index d27a10e..119d4c3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-01-15 20:46+0200\n"
 "Last-Translator: Mișu Moldovan <dumol at xfce.org>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.6.1\n"
@@ -85,238 +85,238 @@ msgid "Settings manager socket"
 msgstr "Socket al managerului opțiunilor"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Schimbați comportamentul ferestrelor și combinațiile de taste asociate"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Manager de ferestre"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Optimizați comportamentul ferestrelor și efectele asociate"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Schimbați comportamentul ferestrelor și combinațiile de taste asociate"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Ajustări pentru ferestre"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Schimbați numărul și numele spațiilor de lucru"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Optimizați comportamentul ferestrelor și efectele asociate"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Spații de lucru"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Cutia de mutare și redimensionare</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Aranjare a butoanelor</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Acțiune _dublu-clic</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>T_emă</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Model de focus</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>F_ont pentru titlu</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Focus pentru ferestre noi</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Ali_niere a titlului</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Trecere deasupra la clic</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Aranjați interactiv mai jos butoanele ferestrelor"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Trecere deasupra la focalizare</b>"
+msgid "Title"
+msgstr "Titlu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Ali_niere a titlului</b>"
+msgid "The window title cannot be removed"
+msgstr "Titlul ferestrei nu poate fi exclus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>F_ont pentru titlu</b>"
+msgid "Active"
+msgstr "Active"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Combinații _de taste pentru ferestre</b>"
+msgid "Menu"
+msgstr "Meniu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Potrivire a ferestrelor</b>"
+msgid "Stick"
+msgstr "Lipește"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Comutare între spațiile de lucru adiacente</b>"
+msgid "Shade"
+msgstr "Strânge"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>T_emă</b>"
+msgid "Minimize"
+msgstr "Minimizează"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximizează"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lungă</i>"
+msgid "Close"
+msgstr "Închide"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ascunse"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Scurtă</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Aranjare a butoanelor</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Mică</i>"
+msgid "_Reset to Defaults"
+msgstr "_Reinițializează"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Combinații _de taste pentru ferestre</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Mare</i>"
+msgid "Ke_yboard"
+msgstr "_Taste"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Active"
+msgid "Clic_k to focus"
+msgstr "Clic p_entru focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vansate"
+msgid "Focus follows _mouse"
+msgstr "Focusul urmează _mausul"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Ferestrele trec automat _deasupra când primesc focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Ferestrele _nou create primesc automat focus"
+msgid "_Delay before window receives focus:"
+msgstr "Întâr_ziere la ridicarea deasupra a ferestrelor noi:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Clic p_entru focus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Aranjați interactiv mai jos butoanele ferestrelor"
+msgid "<i>Short</i>"
+msgstr "<i>Scurtă</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Închide"
+msgid "<i>Long</i>"
+msgstr "<i>Lungă</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Model de focus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Întârziere la r_idicarea deasupra a ferestrelor cu focus:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Ferestrele _nou create primesc automat focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Aprop_iere:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Focus pentru ferestre noi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Focusul urmează _mausul"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Ferestrele trec automat _deasupra când primesc focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ascunse"
+msgid "Delay _before raising focused window:"
+msgstr "Întârziere la r_idicarea deasupra a ferestrelor cu focus:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ascunde conținutul ferestrelor la _mutare"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Trecere deasupra la focalizare</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Ascunde conținutul ferestrelor la _redimensionare"
+msgid "Raise window when clicking _inside application window"
+msgstr "_Ridică deasupra fereastra ce recepționează un clic"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Taste"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Trecere deasupra la clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximizează"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Focus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Meniu"
+msgid "Snap windows to screen _border"
+msgstr "P_otrivește ferestrele la marginile ecranului"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimizează"
+msgid "Snap windows to other _windows"
+msgstr "_Potrivește ferestrele la alte ferestre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "_Ridică deasupra fereastra ce recepționează un clic"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Strânge"
+msgid "Dis_tance:"
+msgstr "Aprop_iere:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "_Potrivește ferestrele la alte ferestre"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "P_otrivește ferestrele la marginile ecranului"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Mică</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Lipește"
+msgid "<i>Wide</i>"
+msgstr "<i>Mare</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Acțiune de efectuat la dublu-clic pe bara de titlu:"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Potrivire a ferestrelor</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Titlul ferestrei nu poate fi exclus"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Treci în spațiul adiacent când mausul ajunge la marginea ecra_nului"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titlu"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Treci în spațiul adiacent la tragerea unei ferestre în afara _ecranului"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Re_zistență a marginii:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Comutare între spațiile de lucru adiacente</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Treci în spațiul adiacent când mausul ajunge la marginea ecra_nului"
+msgid "Hide content of windows when _resizing"
+msgstr "Ascunde conținutul ferestrelor la _redimensionare"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Întâr_ziere la ridicarea deasupra a ferestrelor noi:"
+msgid "Hide content of windows when _moving"
+msgstr "Ascunde conținutul ferestrelor la _mutare"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Re_zistență a marginii:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Cutia de mutare și redimensionare</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Focus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Acțiune de efectuat la dublu-clic pe bara de titlu:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Reinițializează"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Acțiune _dublu-clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "A_vansate"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -658,203 +658,213 @@ msgstr ""
 "Această acțiune va reinițializa toate combinațiile de taste, revenindu-se "
 "astfel la opțiunile implicite. Sigur doriți acest lucru?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Mare</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opace</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Nu include ferestrele cu proprietăți de tip „skip pager” sau „skip taskbar”"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Include ferestrele ascunse (_minimizate)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Transparente</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Ciclează ferestrele din _toate spațiile de lucru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "P_rotejează focusul ferestrei curente"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Desenează un cadru în jurul ferestrelor selectate la ciclare"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "În mijlocul _ecranului"
+msgid "C_ycling"
+msgstr "C_iclare"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Implicit, plasează ferestrele:"
+msgid "Activate _focus stealing prevention"
+msgstr "P_rotejează focusul ferestrei curente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "Compo_zitor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "R_espectă standardul ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "C_iclare"
+msgid "When a window raises itself:"
+msgstr "Acțiune de luat când o fereastră trece în starea „deasupra”:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Ciclează ferestrele din _toate spațiile de lucru"
+msgid "_Bring window on current workspace"
+msgstr "A_du fereastra în spațiul de lucru curent"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Randează direct ferestrele pe tot _ecranul de tip overlay"
+msgid "Switch to win_dow's workspace"
+msgstr "Du-_mă în spațiul de lucru al ferestrei"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Niciuna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ascunde cadrul ferestrelor la ma_ximizare"
+msgid "Key used to _grab and move windows:"
+msgstr "_Tastă pentru prinderea și mutarea ferestrelor:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "R_espectă standardul ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Ridică ferestrele la apăsarea oricărui buton de maus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Păstrează starea de clipire repetată pentru ferestrele _urgente"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ascunde cadrul ferestrelor la ma_ximizare"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "_Tastă pentru prinderea și mutarea ferestrelor:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Utilizează _mărimea inițială la mutarea ferestrelor maximizate"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notifică starea de urgență prin clipirea _decorațiunilor ferestrei"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Utilizează rezistența și nu potri_virea la margini"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opacitate a _decorațiunilor ferestrelor:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notifică starea de urgență prin clipirea _decorațiunilor ferestrei"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacitate a ferestrelor inacti_ve:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Păstrează starea de clipire repetată pentru ferestrele _urgente"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacitate a ferestrelor de tip p_opup:"
+msgid "_Accessibility"
+msgstr "Accesi_bilitate"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacitate a ferestrelor în curs de _mutare:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Schimbă spațiul de lucru curent când folosesc rotița de _maus pe desktop"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacitate a ferestrelor în curs de _redimensionare:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Utilizează _mărimea inițială la mutarea ferestrelor maximizate"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Reține spațiul de lucru precedent la comutarea din tastatură și revino la el"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Arată umbre pentru ferestrele de tip doc_k"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Comută între spațiile de lucru în funcție de dispunerea _desktopului"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Arată umbre pentru ferestrele obiș_nuite"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Comută între primul și _ultimul spațiu de lucru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Arată umbre pentru ferestrele de tip pop_up"
+msgid "_Workspaces"
+msgstr "_Spații de lucru"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Du-_mă în spațiul de lucru al ferestrei"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Sub cursorul ma_usului"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Utilizează rezistența și nu potri_virea la margini"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Schimbă spațiul de lucru curent când folosesc rotița de _maus pe desktop"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Mărime _minimă a ferestrelor ce vor fi plasate inteligent:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Acțiune de luat când o fereastră trece în starea „deasupra”:"
+msgid "<i>Large</i>"
+msgstr "<i>Mare</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Implicit, plasează ferestrele:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Comută între spațiile de lucru în funcție de dispunerea _desktopului"
+msgid "At the _center of the screen"
+msgstr "În mijlocul _ecranului"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Comută între primul și _ultimul spațiu de lucru"
+msgid "Under the mouse _pointer"
+msgstr "Sub cursorul ma_usului"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Accesi_bilitate"
+msgid "_Placement"
+msgstr "_Plasare"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "A_du fereastra în spațiul de lucru curent"
+msgid "_Enable display compositing"
+msgstr "Ac_tivează compozitorul ecranului"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Desenează un cadru în jurul ferestrelor selectate la ciclare"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Randează direct ferestrele pe tot _ecranul de tip overlay"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Ac_tivează compozitorul ecranului"
+msgid "Show shadows under _regular windows"
+msgstr "Arată umbre pentru ferestrele obiș_nuite"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Arată umbre pentru ferestrele de tip pop_up"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Include ferestrele ascunse (_minimizate)"
+msgid "Show shadows under _dock windows"
+msgstr "Arată umbre pentru ferestrele de tip doc_k"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Mărime _minimă a ferestrelor ce vor fi plasate inteligent:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opacitate a _decorațiunilor ferestrelor:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Plasare"
+msgid "<i>Transparent</i>"
+msgstr "<i>Transparente</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Ridică ferestrele la apăsarea oricărui buton de maus"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opace</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Reține spațiul de lucru precedent la comutarea din tastatură și revino la el"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacitate a ferestrelor inacti_ve:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacitate a ferestrelor în curs de _mutare:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Nu include ferestrele cu proprietăți de tip „skip pager” sau „skip taskbar”"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacitate a ferestrelor în curs de _redimensionare:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacitate a ferestrelor de tip p_opup:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Spații de lucru"
+msgid "C_ompositor"
+msgstr "Compo_zitor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Margini</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Numărul spațiilor de lucru:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Spații de lucru</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Nume:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Marginile sunt zone la limita ecranului unde nicio fereastră nu va fi plasată"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Numărul spațiilor de lucru:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Margini</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -862,35 +872,35 @@ msgstr "_Numărul spațiilor de lucru:"
 msgid "%s (on %s)"
 msgstr "%s (pe %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Clonează în fundal"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Clonează în fundal (nesuportat)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Alege modul compozitorului"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Alege modul compozitorului (nesuportat)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Înlocuiește managerul de ferestre activ"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Arată detalii despre versiune și ieși"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENTE...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Încercați „%s --help” pentru lista opțiunilor de utilizare."
@@ -1026,12 +1036,15 @@ msgstr "Eroare la citirea datelor din procesul copil: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nu s-a putut crea fereastra helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Schimbați numărul și numele spațiilor de lucru"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Spații de lucru</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Redenumire a spațiului de lucru"
 
-#~ msgid "_Name:"
-#~ msgstr "_Nume:"
-
 #~ msgid "Hide"
 #~ msgstr "Ascunde"
 
diff --git a/po/ru.po b/po/ru.po
index 8a4a33c..fd475f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,20 +12,21 @@
 # Claque <cpt-alatriste at ya.ru>, 2011.
 # Aleksandr Ponomarenko <davian818 at gmail.com>, 2011.
 # Artem Zolochevskiy <artem.zolochevskiy at gmail.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 07:30+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-08-11 20:58+0300\n"
 "Last-Translator: Artem Zolochevskiy <artem.zolochevskiy at gmail.com>\n"
 "Language-Team: Russian\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -92,238 +93,238 @@ msgid "Settings manager socket"
 msgstr "Сокет менеджера настроек"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Настройка поведения окна и комбинаций клавиш"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Диспетчер окон"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Дополнительная настройка поведения окна и эффектов"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Настройка поведения окна и комбинаций клавиш"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Диспетчер окон (дополнительно)"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Укажите количество и названия рабочих мест"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Дополнительная настройка поведения окна и эффектов"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Рабочие места"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Перемещение и изменение размера окна</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Расположение кнопок</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Действие при двойном щелчке на заголовке</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Тема</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Режим фокуса</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Шрифт заголовка</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Фокус новых окон</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Расположение заголовка</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Поднятие на передний план при щелчке мышью</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Перетащите кнопки для изменения их расположения"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Поднятие на передний план при наведении курсора</b>"
+msgid "Title"
+msgstr "Заголовок"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Расположение заголовка</b>"
+msgid "The window title cannot be removed"
+msgstr "Невозможно удалить заголовок окна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Шрифт заголовка</b>"
+msgid "Active"
+msgstr "Активные"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Комбинации клавиш для работы с окнами</b>"
+msgid "Menu"
+msgstr "Меню"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Прилипание окон</b>"
+msgid "Stick"
+msgstr "Приклеить"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Переключение рабочих мест</b>"
+msgid "Shade"
+msgstr "Свернуть в заголовок"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Тема</b>"
+msgid "Minimize"
+msgstr "Свернуть"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Развернуть"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Большая</i>"
+msgid "Close"
+msgstr "Закрыть"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Скрытые"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Малая</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Расположение кнопок</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "С_тиль"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Маленькое</i>"
+msgid "_Reset to Defaults"
+msgstr "Сбросить _настройки"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Комбинации клавиш для работы с окнами</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Большое</i>"
+msgid "Ke_yboard"
+msgstr "_Клавиатура"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Активные"
+msgid "Clic_k to focus"
+msgstr "Фокус при _щелчке мышью"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "_Дополнительные"
+msgid "Focus follows _mouse"
+msgstr "Фокус следует за _мышью"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Автоматически _поднимать окна на передний план окна, когда они получают фокус"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Автоматически передавать фокус в _новые окна"
+msgid "_Delay before window receives focus:"
+msgstr "З_адержка перед передачей фокуса в окно:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Фокус при _щелчке мышью"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Перетащите кнопки для изменения их расположения"
+msgid "<i>Short</i>"
+msgstr "<i>Малая</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Закрыть"
+msgid "<i>Long</i>"
+msgstr "<i>Большая</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Режим фокуса</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "З_адержка перед поднятием окна с фокусом на передний план:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Автоматически передавать фокус в _новые окна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Расстояние:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Фокус новых окон</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Фокус следует за _мышью"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"Автоматически _поднимать окна на передний план окна, когда они получают фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Скрытые"
+msgid "Delay _before raising focused window:"
+msgstr "З_адержка перед поднятием окна с фокусом на передний план:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Скрывать содержимое окна при _перемещении"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Поднятие на передний план при наведении курсора</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Скрывать содержимое окна при изменении _размера"
+msgid "Raise window when clicking _inside application window"
+msgstr "Поднимать окно на передний план при щелчке _внутри окна программы"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Клавиатура"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Поднятие на передний план при щелчке мышью</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Развернуть"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Фокус"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Меню"
+msgid "Snap windows to screen _border"
+msgstr "Прилипание окон к краям _экрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Свернуть"
+msgid "Snap windows to other _windows"
+msgstr "Прилипание окон к другим _окнам"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Поднимать окно на передний план при щелчке _внутри окна программы"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Свернуть в заголовок"
+msgid "Dis_tance:"
+msgstr "_Расстояние:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Прилипание окон к другим _окнам"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Прилипание окон к краям _экрана"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Маленькое</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Приклеить"
+msgid "<i>Wide</i>"
+msgstr "<i>Большое</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Действие при двойном щелчке на заголовке"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Прилипание окон</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Невозможно удалить заголовок окна"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Переключать рабочие места при достижении _курсором края экрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Заголовок"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Переключать рабочие места при _перемещении окна за экран"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Сопротивление у краёв:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Переключение рабочих мест</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Переключать рабочие места при достижении _курсором края экрана"
+msgid "Hide content of windows when _resizing"
+msgstr "Скрывать содержимое окна при изменении _размера"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "З_адержка перед передачей фокуса в окно:"
+msgid "Hide content of windows when _moving"
+msgstr "Скрывать содержимое окна при _перемещении"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Сопротивление у краёв:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Перемещение и изменение размера окна</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Фокус"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Действие при двойном щелчке на заголовке"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Сбросить _настройки"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Действие при двойном щелчке на заголовке</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "С_тиль"
+msgid "Ad_vanced"
+msgstr "_Дополнительные"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -661,208 +662,218 @@ msgstr ""
 "Это действие сбросит все настройки комбинаций клавиш на их стандартные "
 "значение. Вы действительно хотите сделать это?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Большое</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Непрозрачно</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Пропускать окна, у которых установлено свойство\n"
+"«не показывать в переключателе рабочих мест»\n"
+"или «не показывать на панели задач»"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Включать свёрнутые в значок окна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Прозрачно</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Переключаться _между окнами со всех рабочих мест"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Активировать предотвращение «похищения» _фокуса ввода"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Выделять границы выбранного окна при переключении"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "В _центре экрана"
+msgid "C_ycling"
+msgstr "_Переключение окон"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Размещать окна по умочанию:"
+msgid "Activate _focus stealing prevention"
+msgstr "Активировать предотвращение «похищения» _фокуса ввода"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Эффекты"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Поведение по передаче фокуса по _стандарту ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Переключение окон"
+msgid "When a window raises itself:"
+msgstr "Когда окно активизируется:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Переключаться _между окнами со всех рабочих мест"
+msgid "_Bring window on current workspace"
+msgstr "_Переместить окно на текущее рабочее место"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Отображать полно_экранные окна сразу"
+msgid "Switch to win_dow's workspace"
+msgstr "Переключится на _рабочее место окна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Ничего не _делать"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Скрывать _границы развёрнутого окна"
+msgid "Key used to _grab and move windows:"
+msgstr "Клавиша, используемая для _захвата и перемещения окон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Поведение по передаче фокуса по _стандарту ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Поднимать окна при нажатии любой кнопки мыши"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Непрерывно мигать срочными окнами"
+msgid "Hide _frame of windows when maximized"
+msgstr "Скрывать _границы развёрнутого окна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Клавиша, используемая для _захвата и перемещения окон:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Восстанавливать _исходный размер развернутого окна при перемещении"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Оповещать о срочности, _мигая заголовком окна"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Использовать сопротивление у _краёв вместо прилипания окон"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Прозрачность _оформления окон:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Оповещать о срочности, _мигая заголовком окна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Прозрачность _неактивных окон:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Непрерывно мигать срочными окнами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Прозрачность _всплывающих окон:"
+msgid "_Accessibility"
+msgstr "_Доступность"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Прозрачность окна при _перемещении:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"Переключать рабочие места с помощью прокручивания колёсика _мыши над рабочим "
+"столом"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Прозрачность окон при изменении _размера:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Восстанавливать _исходный размер развернутого окна при перемещении"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"_Запоминать и возвращаться к предыдущему\n"
+"рабочему месту при переключении горячими клавишами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Рисовать тени под сворачивающимися окнами"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Перелистывать рабочие места в зависимости от текущего _расположения"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Рисовать тени под _обычными окнами"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Перелистывать рабочие места далее при достижении _первого или последнего "
+"рабочего места"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Рисовать тени под _всплывающими окнами"
+msgid "_Workspaces"
+msgstr "_Рабочие места"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Переключится на _рабочее место окна"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Под указателем _мыши"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Использовать сопротивление у _краёв вместо прилипания окон"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"Переключать рабочие места с помощью прокручивания колёсика _мыши над рабочим "
-"столом"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Минимальный размер окон, при котором будет включено умное размещение:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Когда окно активизируется:"
+msgid "<i>Large</i>"
+msgstr "<i>Большое</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Размещать окна по умочанию:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Перелистывать рабочие места в зависимости от текущего _расположения"
+msgid "At the _center of the screen"
+msgstr "В _центре экрана"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Перелистывать рабочие места далее при достижении _первого или последнего "
-"рабочего места"
+msgid "Under the mouse _pointer"
+msgstr "Под указателем _мыши"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Доступность"
+msgid "_Placement"
+msgstr "_Размещение"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Переместить окно на текущее рабочее место"
+msgid "_Enable display compositing"
+msgstr "_Включить эффекты"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Выделять границы выбранного окна при переключении"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Отображать полно_экранные окна сразу"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Включить эффекты"
+msgid "Show shadows under _regular windows"
+msgstr "Рисовать тени под _обычными окнами"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Рисовать тени под _всплывающими окнами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Включать свёрнутые в значок окна"
+msgid "Show shadows under _dock windows"
+msgstr "Рисовать тени под сворачивающимися окнами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Минимальный размер окон, при котором будет включено умное размещение:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Прозрачность _оформления окон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Размещение"
+msgid "<i>Transparent</i>"
+msgstr "<i>Прозрачно</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Поднимать окна при нажатии любой кнопки мыши"
+msgid "<i>Opaque</i>"
+msgstr "<i>Непрозрачно</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Запоминать и возвращаться к предыдущему\n"
-"рабочему месту при переключении горячими клавишами"
+msgid "Opacity of _inactive windows:"
+msgstr "Прозрачность _неактивных окон:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Прозрачность окна при _перемещении:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Пропускать окна, у которых установлено свойство\n"
-"«не показывать в переключателе рабочих мест»\n"
-"или «не показывать на панели задач»"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Прозрачность окон при изменении _размера:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Прозрачность _всплывающих окон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Рабочие места"
+msgid "C_ompositor"
+msgstr "_Эффекты"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Поля</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Количество рабочих мест:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Рабочие места</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Название:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Поля – это области экрана, где размещение окон невозможно"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Количество рабочих мест:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Поля</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -870,35 +881,35 @@ msgstr "_Количество рабочих мест:"
 msgid "%s (on %s)"
 msgstr "%s (на %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Перевести в фоновый режим"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Перевести в фоновый режим (не поддерживается)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Установить композитный режим"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Установить композитный режим (не поддерживается)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Заменить существующий оконный менеджер"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Показать информацию о версии и выйти"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ПАРАМЕТРЫ...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Выполните «%s --help» для получения информации об использовании."
@@ -1034,12 +1045,15 @@ msgstr "Ошибка чтения данных от процесса потом
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Невозможно отобразить диалог помощи: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Укажите количество и названия рабочих мест"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Рабочие места</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Изменить название рабочего места"
 
-#~ msgid "_Name:"
-#~ msgstr "_Название:"
-
 #~ msgid "Hide"
 #~ msgstr "Свернуть"
 
diff --git a/po/si.po b/po/si.po
index 3db3620..85fc657 100644
--- a/po/si.po
+++ b/po/si.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-03-13 18:58+0530\n"
 "Last-Translator: Akila Wajirasena <akila.wajirasena at gmail.com>\n"
 "Language-Team: Sinhala <info at hanthana.org>\n"
+"Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -84,253 +84,252 @@ msgid "Settings manager socket"
 msgstr "සැකසුම් කළමනාකරන සොකට්ටුව"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "කවුළු හැසිරීම් හා කෙටිමං වින්‍යාස කරන්න "
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "කවුළු කළමනාකරු"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Fine-tune window behaviour and effects"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "කවුළු හැසිරීම් හා කෙටිමං වින්‍යාස කරන්න "
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr ""
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-#, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "වැඩ අවකාශ අංකය හා නම් පිහිටුවන්න"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Fine-tune window behaviour and effects"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "වැඩ අවකාශ"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>බොත්තම් පිරිසැලසුම</b>"
-
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>ද්වි ක්ලික්  ක්‍රියාව (_a)</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>තේමාව (_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>යොමු ආකෘතිය</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>සිරසි ෆොන්ටය (_t)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>නව කවුළු යොමුව</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>සිරැසි පෙළගැස්ම (_a)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "<b>ක්ලික් කිරිමේදී නගන්න</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "<b>යොමු විමේදී නගන්න</b>"
+msgid "Title"
+msgstr "සිරැසිය"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>සිරැසි පෙළගැස්ම (_a)</b>"
+msgid "The window title cannot be removed"
+msgstr "මෙම කවුළු සිරසිය ඉවත් කළ නොහැක"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>සිරසි ෆොන්ටය (_t)</b>"
+msgid "Active"
+msgstr "සක්‍රීය"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>කවුළු කෙටිමං (_s)</b>"
+msgid "Menu"
+msgstr "මෙනුව"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
 #, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr " <b>කවුළු එකට ඇදීම</b>"
+msgid "Stick"
+msgstr "ඇලවෙන්න"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
 #, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b> වැඩතල වෙළන්න</b>"
+msgid "Shade"
+msgstr "අඳුරු කිරීම"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>තේමාව (_T)</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "හකුළන්න (_n)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+#, fuzzy
+msgid "Maximize"
+msgstr "විහිදන්න"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>දිග</i>"
+msgid "Close"
+msgstr "වසන්න"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "සැඟවුණු"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>කෙටි</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>බොත්තම් පිරිසැලසුම</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "විලාසය (_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>කුඩා</i>"
+msgid "_Reset to Defaults"
+msgstr "පෙරනිමියට යළි පිහිටුවන්න (_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>කවුළු කෙටිමං (_s)</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>පළල්</i>"
+msgid "Ke_yboard"
+msgstr "යතුරුපුවරුව (_y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "සක්‍රීය"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "යොමුවීම සඳහා ක්ලික් කරන්න"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr ""
+msgid "Focus follows _mouse"
+msgstr "යොමුවීම මූසිකය අනුගමනය කරයි (_m)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "කවුළු වෙත යොමු වූ පසු ස්වයංක්‍රීයවම ඒවා නගන්න (_r)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "අලුතින් ඇතිවූ කවුළු වෙත ස්වයංක්‍රීයවම යොමු වෙන්න (_n)"
+msgid "_Delay before window receives focus:"
+msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "යොමුවීම සඳහා ක්ලික් කරන්න"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr ""
+msgid "<i>Short</i>"
+msgstr "<i>කෙටි</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "වසන්න"
+msgid "<i>Long</i>"
+msgstr "<i>දිග</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>යොමු ආකෘතිය</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "යොමුවූ කවුළුව නැගීමට පෙර පමාව (_b): "
+msgid "Automatically give focus to _newly created windows"
+msgstr "අලුතින් ඇතිවූ කවුළු වෙත ස්වයංක්‍රීයවම යොමු වෙන්න (_n)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "දුර (_s):"
+msgid "<b>New window focus</b>"
+msgstr "<b>නව කවුළු යොමුව</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "යොමුවීම මූසිකය අනුගමනය කරයි (_m)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "කවුළු වෙත යොමු වූ පසු ස්වයංක්‍රීයවම ඒවා නගන්න (_r)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "සැඟවුණු"
+msgid "Delay _before raising focused window:"
+msgstr "යොමුවූ කවුළුව නැගීමට පෙර පමාව (_b): "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "එහාමෙහා යාමේදී කවුළු අන්තර්ගතය සඟවන්න (_m) "
+#, fuzzy
+msgid "<b>Raise on focus</b>"
+msgstr "<b>යොමු විමේදී නගන්න</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "ප්‍රමානය වෙනස් කිරීමේදී කවුළු අන්තර්ගතය සඟවන්න (_r)"
+#, fuzzy
+msgid "Raise window when clicking _inside application window"
+msgstr "යෙදුම් කවුළුව තුල ක්ලික් කිරීමේදී කවුළුව නගන්න (_i)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "යතුරුපුවරුව (_y)"
+#, fuzzy
+msgid "<b>Raise on click</b>"
+msgstr "<b>ක්ලික් කිරිමේදී නගන්න</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
 #, fuzzy
-msgid "Maximize"
-msgstr "විහිදන්න"
+msgid "_Focus"
+msgstr "යොමුව (_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "මෙනුව"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "කවුළු තිර දාරය වෙත අද්දවන්න (_w)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "හකුළන්න (_n)"
+msgid "Snap windows to other _windows"
+msgstr "කවුළු අනෙක් කවුළු වලට අද්දවන්න (_w)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-#, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "යෙදුම් කවුළුව තුල ක්ලික් කිරීමේදී කවුළුව නගන්න (_i)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-#, fuzzy
-msgid "Shade"
-msgstr "අඳුරු කිරීම"
+msgid "Dis_tance:"
+msgstr "දුර (_s):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-#, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "කවුළු අනෙක් කවුළු වලට අද්දවන්න (_w)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "කවුළු තිර දාරය වෙත අද්දවන්න (_w)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>කුඩා</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-#, fuzzy
-msgid "Stick"
-msgstr "ඇලවෙන්න"
+msgid "<i>Wide</i>"
+msgstr "<i>පළල්</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "ක්‍රියාව සිදුවන්නේ නාම තීරුව ද්වි ක්ලික් කළ විටය"
+#, fuzzy
+msgid "<b>Windows snapping</b>"
+msgstr " <b>කවුළු එකට ඇදීම</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "මෙම කවුළු සිරසිය ඉවත් කළ නොහැක"
+#, fuzzy
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "දක්වනය තිරයේ දාරයට ගියවිට වැඩතල වෙළන්න (_p)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "සිරැසිය"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "තිරයෙන් පිටතට කවුළුවක් ඇදගෙන යාමේදී වැඩතල වෙළන්න (_d)"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:50
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "දක්වනය තිරයේ දාරයට ගියවිට වැඩතල වෙළන්න (_p)"
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b> වැඩතල වෙළන්න</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:50
+msgid "Hide content of windows when _resizing"
+msgstr "ප්‍රමානය වෙනස් කිරීමේදී කවුළු අන්තර්ගතය සඟවන්න (_r)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr ""
+msgid "Hide content of windows when _moving"
+msgstr "එහාමෙහා යාමේදී කවුළු අන්තර්ගතය සඟවන්න (_m) "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-#, fuzzy
-msgid "_Focus"
-msgstr "යොමුව (_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "ක්‍රියාව සිදුවන්නේ නාම තීරුව ද්වි ක්ලික් කළ විටය"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "පෙරනිමියට යළි පිහිටුවන්න (_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>ද්වි ක්ලික්  ක්‍රියාව (_a)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "විලාසය (_S)"
+msgid "Ad_vanced"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -691,215 +690,224 @@ msgid ""
 msgstr ""
 "මෙමගින් සියලු කෙටිමං ඒවායේ පෙරනිමි තත්වයට පත් කරනු ඇත. ඔබට ඇත්තටම මෙය කිරීමට අවශ්‍යද? "
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>විශාල</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "<i>පාරාන්ධ</i>"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "සැඟවුනු (i.e. iconified) කවුළුත්  අඩංගු කරන්න (_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-#, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "<i>පාරදෘශ්‍ය</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "සියලු වැඩ අවකාශ වල ඇති කවුළු හරහා චක්‍රියව යන්න (_t)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
-# තිරයේ මැදදී (_c)
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
 #, fuzzy
-msgid "At the _center of the screen"
-msgstr "තිරයේ මැද (_c)"
+msgid "C_ycling"
+msgstr "චක්‍රීය ලෙස යෑම (_y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-#, fuzzy
-msgid "By default, place windows:"
-msgstr "පෙරනිමියෙන්, කවුළු පිහිටුවන්න:"
+msgid "Activate _focus stealing prevention"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "වර්ණයෝජක (_o)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "චක්‍රීය ලෙස යෑම (_y)"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "සියලු වැඩ අවකාශ වල ඇති කවුළු හරහා චක්‍රියව යන්න (_t)"
+msgid "_Bring window on current workspace"
+msgstr "වත්මන් වැඩ අවකායට කවුළුව ගෙනෙන්න (_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+msgid "Switch to win_dow's workspace"
+msgstr "කවුළුවේ වැඩ අවකාශය වෙත මාරුවන්න (_d)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "කිසිවක් කරන්න එපා (_n)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "විහිදී ඇති විට කවුළු රාමුව සඟවන්න (_f)"
+msgid "Key used to _grab and move windows:"
+msgstr "කවුළු අල්ලා එහාමෙහා ගෙනයාමට භාවිත කරන යතුර (_g):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr ""
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "ඔනැම මූසික බොත්තමක් තද කල විට කවුළුව නගන්න (_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "හදිසි කවුළු "
+msgid "Hide _frame of windows when maximized"
+msgstr "විහිදී ඇති විට කවුළු රාමුව සඟවන්න (_f)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "කවුළු අල්ලා එහාමෙහා ගෙනයාමට භාවිත කරන යතුර (_g):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "කවුළු අලංකරණයේ පාරාන්ධතාව (_t): "
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "අකර්මණ්‍ය කවුළු වල පාරාන්ධතාව (_i):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "හදිසි කවුළු "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "මතු වන කවුළු වල පාරාන්ධතාව (_s):"
+msgid "_Accessibility"
+msgstr "ප්‍රවේශ්‍යතාව"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "කවුළු ගමන් කරන අතරතුර පාරාන්ධතාව (_m):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "කවුළු ප්‍රමාණය වෙනස්කරන   අතරතුර පාරාන්ධතාව (_m):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "සාමාන්‍ය කවුළු යටින් සෙවනැලි පෙන්වන්න (_r)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-#, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "පැනුම් කවුලළු යටින් සෙවනැලි පෙන්වන්න (_u)"
+msgid "_Workspaces"
+msgstr "වැඩ අවකාශ (_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "කවුළුවේ වැඩ අවකාශය වෙත මාරුවන්න (_d)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-#, fuzzy
-msgid "Under the mouse _pointer"
-msgstr "මූසික දක්වනය යට (_p)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "<i>විශාල</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#, fuzzy
+msgid "By default, place windows:"
+msgstr "පෙරනිමියෙන්, කවුළු පිහිටුවන්න:"
 
+# තිරයේ මැදදී (_c)
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
+#, fuzzy
+msgid "At the _center of the screen"
+msgstr "තිරයේ මැද (_c)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
+#, fuzzy
+msgid "Under the mouse _pointer"
+msgstr "මූසික දක්වනය යට (_p)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "ප්‍රවේශ්‍යතාව"
+#, fuzzy
+msgid "_Placement"
+msgstr "පිහිටැවුම (_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "වත්මන් වැඩ අවකායට කවුළුව ගෙනෙන්න (_B)"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr ""
+msgid "Show shadows under _regular windows"
+msgstr "සාමාන්‍ය කවුළු යටින් සෙවනැලි පෙන්වන්න (_r)"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "සැඟවුනු (i.e. iconified) කවුළුත්  අඩංගු කරන්න (_I)"
+msgid "Show shadows under pop_up windows"
+msgstr "පැනුම් කවුලළු යටින් සෙවනැලි පෙන්වන්න (_u)"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
+msgid "Show shadows under _dock windows"
 msgstr ""
 
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
+msgid "Opaci_ty of window decorations:"
+msgstr "කවුළු අලංකරණයේ පාරාන්ධතාව (_t): "
+
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "පිහිටැවුම (_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>පාරදෘශ්‍ය</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "ඔනැම මූසික බොත්තමක් තද කල විට කවුළුව නගන්න (_R)"
+#, fuzzy
+msgid "<i>Opaque</i>"
+msgstr "<i>පාරාන්ධ</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "අකර්මණ්‍ය කවුළු වල පාරාන්ධතාව (_i):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "කවුළු ගමන් කරන අතරතුර පාරාන්ධතාව (_m):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "කවුළු ප්‍රමාණය වෙනස්කරන   අතරතුර පාරාන්ධතාව (_m):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "මතු වන කවුළු වල පාරාන්ධතාව (_s):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "වැඩ අවකාශ (_W)"
+#, fuzzy
+msgid "C_ompositor"
+msgstr "වර්ණයෝජක (_o)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "වැඩ අවකාශ ගණන (_N):"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "<b>මායිම් ඉඩ</b>"
+msgid "Names"
+msgstr "නම (_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>වැඩ අවකාශ</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "වැඩ අවකාශ ගණන (_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>මායිම් ඉඩ</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -907,36 +915,36 @@ msgstr "වැඩ අවකාශ ගණන (_N):"
 msgid "%s (on %s)"
 msgstr "%s (මත %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "අනුවාද තොරතුරු"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1076,12 +1084,16 @@ msgstr ""
 "උදව් සංවාද කොටුව ඉපදවීමට නොහැක: %s\n"
 "\r\n"
 
+#, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "වැඩ අවකාශ අංකය හා නම් පිහිටුවන්න"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>වැඩ අවකාශ</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "වැඩ අවකාශ නාමය වෙනස් කරන්න"
 
-#~ msgid "_Name:"
-#~ msgstr "නම (_N):"
-
 #~ msgid "Hide"
 #~ msgstr "සඟවන්න"
 
diff --git a/po/sk.po b/po/sk.po
index a3beac1..233447b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2012-02-13 14:32+0100\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
 "Language-Team: slovenčina <slovenska-lokalizacia-xfce at googlegroups.com>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
@@ -87,237 +87,237 @@ msgid "Settings manager socket"
 msgstr "Nastavenia správcu soketu"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfigurácia správania okna a klávesových skratiek"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Správca okien"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Doladenie správania okna a efektov"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfigurácia správania okna a klávesových skratiek"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Pokročilé nastavenie správcu okien"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Nastavte počet pracovných plôch"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Doladenie správania okna a efektov"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Pracovné plochy"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Vykresľovanie okna pri presune a zmene veľkosti</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Rozloženie tlačidiel</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Akcia pri dvojkliku</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Motív</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Spôsob aktivácie okna</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Písmo _titulku</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Nové okno je aktívne</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Zarovnanie titulku</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Kliknutím zdvihnúť</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Kliknite a ťahajte tlačidlá pre zmenu rozloženia"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Zdvihnúť pri aktivácii</b>"
+msgid "Title"
+msgstr "Titulok"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Zarovnanie titulku</b>"
+msgid "The window title cannot be removed"
+msgstr "Titulok okna nemôže byť odstránený"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Písmo _titulku</b>"
+msgid "Active"
+msgstr "Aktívny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Klávesové _skratky správcu okien</b>"
+msgid "Menu"
+msgstr "Ponuka"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Prichytávanie okien</b>"
+msgid "Stick"
+msgstr "Prilepiť"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Prechádzanie medzi plochami</b>"
+msgid "Shade"
+msgstr "Zabaliť"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Motív</b>"
+msgid "Minimize"
+msgstr "Minimalizovať"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximalizovať"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Dlhé</i>"
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Skryté"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Krátke</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Rozloženie tlačidiel</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "Š_týl"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Malá</i>"
+msgid "_Reset to Defaults"
+msgstr "_Obnoviť predvolené"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Klávesové _skratky správcu okien</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Veľká</i>"
+msgid "Ke_yboard"
+msgstr "_Klávesnica"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktívny"
+msgid "Clic_k to focus"
+msgstr "_Kliknúť pre zameranie"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "P_okročilé"
+msgid "Focus follows _mouse"
+msgstr "Zamerať _umiestnenením kurzoru myši nad okno"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Po zameraní automaticky _zdvihnúť okná"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Automaticky zameriavať _novovytvorené okná"
+msgid "_Delay before window receives focus:"
+msgstr "_Oneskorenie pred presunutím okna do popredia:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Kliknúť pre zameranie"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Kliknite a ťahajte tlačidlá pre zmenu rozloženia"
+msgid "<i>Short</i>"
+msgstr "<i>Krátke</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Zatvoriť"
+msgid "<i>Long</i>"
+msgstr "<i>Dlhé</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Spôsob aktivácie okna</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Oneskorenie _pred zdvihnutím zameraného okna:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Automaticky zameriavať _novovytvorené okná"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Vzdialenosť:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Nové okno je aktívne</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Zamerať _umiestnenením kurzoru myši nad okno"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Po zameraní automaticky _zdvihnúť okná"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Skryté"
+msgid "Delay _before raising focused window:"
+msgstr "Oneskorenie _pred zdvihnutím zameraného okna:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Nezobrazovať obsah obsah okna pri _presúvaní"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Zdvihnúť pri aktivácii</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Nezobrazovať obsah obsah okna pri zmene _veľkosti"
+msgid "Raise window when clicking _inside application window"
+msgstr "Zdvihnúť okno, keď je kliknuté vo vnútri okna aplikácie"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Klávesnica"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Kliknutím zdvihnúť</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximalizovať"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Zameranie"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Ponuka"
+msgid "Snap windows to screen _border"
+msgstr "Prichytávať okná k _okrajom obrazovky"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Minimalizovať"
+msgid "Snap windows to other _windows"
+msgstr "Prichytávať okná k iným _oknám"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Zdvihnúť okno, keď je kliknuté vo vnútri okna aplikácie"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Zabaliť"
+msgid "Dis_tance:"
+msgstr "_Vzdialenosť:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Prichytávať okná k iným _oknám"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Prichytávať okná k _okrajom obrazovky"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Malá</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Prilepiť"
+msgid "<i>Wide</i>"
+msgstr "<i>Veľká</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Akcia pri dvojkliku na titulku okna"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Prichytávanie okien</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Titulok okna nemôže byť odstránený"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Prejsť na vedľajšiu _plochu pri ukázaní kurzorom myši k okraju plochy"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titulok"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Prejsť na ve_dľajšiu plochu pri pretiahnutí okna mimo oblasť obrazovky"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Odolnosť okrajov:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Prechádzanie medzi plochami</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Prejsť na vedľajšiu _plochu pri ukázaní kurzorom myši k okraju plochy"
+msgid "Hide content of windows when _resizing"
+msgstr "Nezobrazovať obsah obsah okna pri zmene _veľkosti"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Oneskorenie pred presunutím okna do popredia:"
+msgid "Hide content of windows when _moving"
+msgstr "Nezobrazovať obsah obsah okna pri _presúvaní"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Odolnosť okrajov:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Vykresľovanie okna pri presune a zmene veľkosti</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Zameranie"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Akcia pri dvojkliku na titulku okna"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Obnoviť predvolené"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Akcia pri dvojkliku</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "Š_týl"
+msgid "Ad_vanced"
+msgstr "P_okročilé"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -655,205 +655,215 @@ msgstr ""
 "Toto nastaví všetky klávesové skratky na predvolené hodnoty. Naozaj chcete "
 "pokračovať?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Veľká</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Nepriehľadné</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Pre_skočiť okná s nastavenou vlastnosťou\n"
+"\"vynechať v prepínači plôch\" alebo \"vynechať v paneli úloh\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Zahrnúť _skryté (minimalizované) okná"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Priehľadné</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Prechádzať oknami zo všetkých pracovných plôch"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Predchádzať strate _zamerania okna"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Vykresľovať rám okolo okien pri prechádzaní"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "V _strede obrazovky"
+msgid "C_ycling"
+msgstr "Pr_echádzanie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Predvolené umiestňovanie okien:"
+msgid "Activate _focus stealing prevention"
+msgstr "Predchádzať strate _zamerania okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Kompozitor"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Dodržiavať š_tandardný ICCCM focus hint"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Pr_echádzanie"
+msgid "When a window raises itself:"
+msgstr "Po samovoľnom premiestnení okna do popredia:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Prechádzať oknami zo všetkých pracovných plôch"
+msgid "_Bring window on current workspace"
+msgstr "Presunúť okno na a_ktuálnu pracovnú plochu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Použiť priame zobrazovanie pre okná v režime _celej obrazovky"
+msgid "Switch to win_dow's workspace"
+msgstr "Prepnúť sa na _pracovnú plochu okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Nerobiť _nič"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Skryť _okraje okna pri maximalizácií"
+msgid "Key used to _grab and move windows:"
+msgstr "Klávesa pre _uchopenie a presun okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Dodržiavať š_tandardný ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "P_reniesť okno do popredia po stlačení ľubovoľného tlačidla myši"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Zachovať _blikanie u okna s príznakom urgent"
+msgid "Hide _frame of windows when maximized"
+msgstr "Skryť _okraje okna pri maximalizácií"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Klávesa pre _uchopenie a presun okien:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Pri presune obnoviť pôvodnú _veľkosť pri maximalizovaných oknách"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "_Upozorniť na príznak urgent blikaním dekorácie okna"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Použiť odolnosť okrajov nami_esto prichytávania okien"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Priehľadnosť _dekorácii okien:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "_Upozorniť na príznak urgent blikaním dekorácie okna"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Priehľadnosť _neaktívnych okien:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Zachovať _blikanie u okna s príznakom urgent"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Priehľadnosť _vyskakovacích okien:"
+msgid "_Accessibility"
+msgstr "Prí_stupnosť"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Priehľadnosť okien pri _presúvaní:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Použiť koliesko myši na pracovnej ploche na prepínanie plôch"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Priehľadnosť okien pri zmene _veľkosti:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Pri presune obnoviť pôvodnú _veľkosť pri maximalizovaných oknách"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Zapamätať si a znovu vyvolať p_redchádzajúcu plochu\n"
+"pri prepínaní klávesovými skratkami"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Zobraziť tiene pod _dokovacími oknami"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Prechádzať na plochy podľa ich aktuá_lneho rozmiestnenia"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Zobraziť tiene pod _bežnými oknami"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Prechádzať pri dosiahnutí p_rvej alebo poslednej pracovnej plochy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Zobrazovať tiene pod _vyskakovacími oknami"
+msgid "_Workspaces"
+msgstr "P_racovné plochy"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Prepnúť sa na _pracovnú plochu okna"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Pod _ukazovateľom myši"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Použiť odolnosť okrajov nami_esto prichytávania okien"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Použiť koliesko myši na pracovnej ploche na prepínanie plôch"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Najmenšia veľkosť okien pre použitie šikovného umiestnenia:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Po samovoľnom premiestnení okna do popredia:"
+msgid "<i>Large</i>"
+msgstr "<i>Veľká</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Predvolené umiestňovanie okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Prechádzať na plochy podľa ich aktuá_lneho rozmiestnenia"
+msgid "At the _center of the screen"
+msgstr "V _strede obrazovky"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Prechádzať pri dosiahnutí p_rvej alebo poslednej pracovnej plochy"
+msgid "Under the mouse _pointer"
+msgstr "Pod _ukazovateľom myši"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "Prí_stupnosť"
+msgid "_Placement"
+msgstr "_Umiestnenie"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Presunúť okno na a_ktuálnu pracovnú plochu"
+msgid "_Enable display compositing"
+msgstr "Povoliť zobrazenie kompozícií"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Vykresľovať rám okolo okien pri prechádzaní"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Použiť priame zobrazovanie pre okná v režime _celej obrazovky"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Povoliť zobrazenie kompozícií"
+msgid "Show shadows under _regular windows"
+msgstr "Zobraziť tiene pod _bežnými oknami"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Zobrazovať tiene pod _vyskakovacími oknami"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Zahrnúť _skryté (minimalizované) okná"
+msgid "Show shadows under _dock windows"
+msgstr "Zobraziť tiene pod _dokovacími oknami"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Najmenšia veľkosť okien pre použitie šikovného umiestnenia:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Priehľadnosť _dekorácii okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Umiestnenie"
+msgid "<i>Transparent</i>"
+msgstr "<i>Priehľadné</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "P_reniesť okno do popredia po stlačení ľubovoľného tlačidla myši"
+msgid "<i>Opaque</i>"
+msgstr "<i>Nepriehľadné</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Zapamätať si a znovu vyvolať p_redchádzajúcu plochu\n"
-"pri prepínaní klávesovými skratkami"
+msgid "Opacity of _inactive windows:"
+msgstr "Priehľadnosť _neaktívnych okien:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Priehľadnosť okien pri _presúvaní:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Pre_skočiť okná s nastavenou vlastnosťou\n"
-"\"vynechať v prepínači plôch\" alebo \"vynechať v paneli úloh\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Priehľadnosť okien pri zmene _veľkosti:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Priehľadnosť _vyskakovacích okien:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "P_racovné plochy"
+msgid "C_ompositor"
+msgstr "_Kompozitor"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Okraje</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Počet pracovných plôch:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Pracovné plochy</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Meno:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Okraje plôch sú miesta po stranách obrazovky, kam nemôžu byť umiestnené "
 "žiadne okná"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Počet pracovných plôch:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Okraje"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -861,35 +871,35 @@ msgstr "_Počet pracovných plôch:"
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Presunúť do pozadia"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Presunúť do pozadia (nepodporované)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Nastaviť režim kompozitora"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Nastaviť režim kompozitora (nepodporované)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Nahradiť existujúceho správcu okien"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Zobrazí informácie o verzii a ukončí sa"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[PARAMETRE...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Informácie o použití získate príkazom \"%s --help\" ."
@@ -1024,6 +1034,15 @@ msgstr "Chyba pri čítaní dát z procesu potomka: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Nedá sa vytvoriť helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Nastavte počet pracovných plôch"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Okraje</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Pracovné plochy</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Zmeniť názov pracovnej plochy"
 
@@ -1207,9 +1226,6 @@ msgstr "Nedá sa vytvoriť helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Zmeniť meno"
 
-#~ msgid "Name:"
-#~ msgstr "Meno:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "K zmene názvu virtuálnej plochy kliknite na jej meno"
 
@@ -1225,9 +1241,6 @@ msgstr "Nedá sa vytvoriť helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Pracovné plochy a okraje"
 
-#~ msgid "Margins"
-#~ msgstr "Okraje"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Nastavenia správcu okien"
 
diff --git a/po/sq.po b/po/sq.po
index 84eebe2..885c228 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-09-25 16:38+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -81,242 +81,242 @@ msgid "Settings manager socket"
 msgstr "\"Socket\" përgjegjësi rregullimesh"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Formësoni sjellje dhe shkurtore dritareje"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Përgjegjës Dritaresh"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Rregulloni më imët efekte dhe sjellje dritaresh"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Formësoni sjellje dhe shkurtore dritareje"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Rregullime të Imta për Përgjegjës Dritaresh"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Caktoni numrat dhe emrat e hapësirave të punës"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Rregulloni më imët efekte dhe sjellje dritaresh"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Hapësira pune"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Lëvizje dhe ripërmasim kutie</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Skemë butonash</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Veprim dyklikimi</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Temë</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Model fokusi</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Gërma titulli</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus mbi dritare të reja</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Drejtim titulli</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Ngrije kur klikohet</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Për të ndryshuar skemën, klikoni dhe tërhiqni zvarrë butona "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Ngrije kur fokusohet</b>"
+msgid "Title"
+msgstr "Titull"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Drejtim titulli</b>"
+msgid "The window title cannot be removed"
+msgstr "Titulli i dritares nuk mund të hiqet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Gërma titulli</b>"
+msgid "Active"
+msgstr "Veprues"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>_Shkurtore dritareje</b>"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Përlarje dritaresh</b>"
+msgid "Stick"
+msgstr "Ngec"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Mbështill hapësira pune</b>"
+msgid "Shade"
+msgstr "Hije"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Temë</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "_Minimizo"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maksimizo"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Vonesë|<i>E gjatë</i>"
+msgid "Close"
+msgstr "Mbyll"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Padukshëm"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
-msgid "<i>Short</i>"
-msgstr "Vonesë|<i>E shkurtër</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Skemë butonash</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-#, fuzzy
-msgid "<i>Small</i>"
-msgstr "Madhësi|<i>E vogël</i>"
+msgid "_Reset to Defaults"
+msgstr "_Riktheji te Parazgjedhjet"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>_Shkurtore dritareje</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Largësi|<i>E madhe</i>"
+msgid "Ke_yboard"
+msgstr "_Tastierë"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Veprues"
+msgid "Clic_k to focus"
+msgstr "_Klikoni për fokusim"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Të _mëtejshme"
+msgid "Focus follows _mouse"
+msgstr "Fokusimi ndjek _miun"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "_Ngriji dritaret vetvetiu kur këto marrin fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Jepu fokus vetvetiu dritareve të krijuara _rishtazi"
+msgid "_Delay before window receives focus:"
+msgstr "_Vonesë para se dritarja të marrë fokus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "_Klikoni për fokusim"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Për të ndryshuar skemën, klikoni dhe tërhiqni zvarrë butona "
+#, fuzzy
+msgid "<i>Short</i>"
+msgstr "Vonesë|<i>E shkurtër</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Mbyll"
+#, fuzzy
+msgid "<i>Long</i>"
+msgstr "Vonesë|<i>E gjatë</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Model fokusi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Vonesë _përpara se të ngrihet dritarja e fokusuar :"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Jepu fokus vetvetiu dritareve të krijuara _rishtazi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "_Largësi:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus mbi dritare të reja</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokusimi ndjek _miun"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "_Ngriji dritaret vetvetiu kur këto marrin fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Padukshëm"
+msgid "Delay _before raising focused window:"
+msgstr "Vonesë _përpara se të ngrihet dritarja e fokusuar :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Fshihe përmbajtjen e dritares kur _lëvizet"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Ngrije kur fokusohet</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Fshihe përmbajtjen e dritares kur _ripërmasohet"
+msgid "Raise window when clicking _inside application window"
+msgstr "Ngrije dritaren kur klikohet _brenda dritares së një zbatimi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_Tastierë"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Ngrije kur klikohet</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maksimizo"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menu"
+msgid "Snap windows to screen _border"
+msgstr "Përla dritare afër _caqeve të ekranit"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "_Minimizo"
+msgid "Snap windows to other _windows"
+msgstr "Përla dritare afër _dritaresh të tjera"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Ngrije dritaren kur klikohet _brenda dritares së një zbatimi"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Hije"
+msgid "Dis_tance:"
+msgstr "_Largësi:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Përla dritare afër _dritaresh të tjera"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Përla dritare afër _caqeve të ekranit"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#, fuzzy
+msgid "<i>Small</i>"
+msgstr "Madhësi|<i>E vogël</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Ngec"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Largësi|<i>E madhe</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Veprim për t'u bërë kur dyklikohet te shtyllë titulli"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Përlarje dritaresh</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Titulli i dritares nuk mund të hiqet"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Mbështill hapësira pune kur _treguesi arrin në një skaj ekrani"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titull"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Mbështill hapësira pune kur një dritare _tërhiqet përtej ekranit"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Qëndresë _skajesh :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Mbështill hapësira pune</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Mbështill hapësira pune kur _treguesi arrin në një skaj ekrani"
+msgid "Hide content of windows when _resizing"
+msgstr "Fshihe përmbajtjen e dritares kur _ripërmasohet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Vonesë para se dritarja të marrë fokus:"
+msgid "Hide content of windows when _moving"
+msgstr "Fshihe përmbajtjen e dritares kur _lëvizet"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Qëndresë _skajesh :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Lëvizje dhe ripërmasim kutie</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Veprim për t'u bërë kur dyklikohet te shtyllë titulli"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "_Riktheji te Parazgjedhjet"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Veprim dyklikimi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "Të _mëtejshme"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -660,209 +660,219 @@ msgstr ""
 "Kjo do të rikthejë tërë shkurtoret te vlerat e tyre parazgjedhje. Doni "
 "vërtet të bëhet kjo?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
-msgid "<i>Large</i>"
-msgstr "Madhësi|<i>E madhe</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>I marrtë</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Anashkalo dritare që kanë të caktuar vetinë\n"
+"\"anashkalo faques\" ose \"anashkalo shtyllë veprimesh\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Përfshi dritare të fshehura (d.m.th. të ikonizuara)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>I tejdukshëm</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Ciklo _nëpër dritare prej tërë hapësirave të punës"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktivizo parandalim vjedhjeje _fokusi"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Vizato kornizë përreth dritareve të përzgjedhura kur cikolhet"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Në _qendër të ekranit"
+msgid "C_ycling"
+msgstr "_Ciklim"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Dritaret, si parazgjedhje, vendosi:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktivizo parandalim vjedhjeje _fokusi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Hartues"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Respekto ndihmëza fokusi _standarde ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "_Ciklim"
+msgid "When a window raises itself:"
+msgstr "Kur një dritare ngre veten:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Ciklo _nëpër dritare prej tërë hapësirave të punës"
+msgid "_Bring window on current workspace"
+msgstr "_Bjere dritaren te hapësira e punës e tanishme"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+msgid "Switch to win_dow's workspace"
+msgstr "Kalo te hapësira e punës e _dritares"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "_Mos bëj gjë"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Fshih _kornizë dritaresh kur zmadhohen në maksimum"
+msgid "Key used to _grab and move windows:"
+msgstr "Tast i përdorur për kapje dhe zhvendosje dritaresh"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Respekto ndihmëza fokusi _standarde ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Ngri dritare kur shtypet çfarëdo butoni miu"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Dritaret urgjente mbaji _xixëlluese me përsëritje"
+msgid "Hide _frame of windows when maximized"
+msgstr "Fshih _kornizë dritaresh kur zmadhohen në maksimum"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tast i përdorur për kapje dhe zhvendosje dritaresh"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Kur lëvizen, rikthe _madhësinë origjinale të dritareve të zmadhuara në "
+"maksimum"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Njofto urgjencë duke xixëlluar zbukurimin e dritares"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Përdor më mirë qëndresë _skajesh se sa përlarje dritaresh"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "_Patejdukshmëri e zbukurimeve të dritareve:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Njofto urgjencë duke xixëlluar zbukurimin e dritares"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Patejdukshmëri dritaresh _jovepruese:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Dritaret urgjente mbaji _xixëlluese me përsëritje"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Patejdukshmëri _dritaresh flluckë:"
+msgid "_Accessibility"
+msgstr "_Hyrshmëri"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Patejdukshmëri dritaresh gjatë _lëvizjesh:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Këmbe hapësira pune duke përdorur në desktop rrotëzën e _miut"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Patejdukshmëri dritaresh gjatë _ripërmasimesh:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Kur lëvizen, rikthe _madhësinë origjinale të dritareve të zmadhuara në "
-"maksimum"
+"_Mbaj mend hapësira të mëparshme pune\n"
+"kur këmbehen përmes shkurtoresh tastiere"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Shfaq hije nën dritare _shtylle"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Mbështill hapësira pune në varësi të _skemës aktuale për desktopin"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Shfaq hije nën dritare të _rregullta"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Mbështill hapësira pune kur mbërrihet te hapësira e _parë apo e fundit e "
+"punës"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Shfaq hije nën dritare _flluckë"
+msgid "_Workspaces"
+msgstr "_Hapësira pune"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Kalo te hapësira e punës e _dritares"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Nën _treguesin e miut"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Përdor më mirë qëndresë _skajesh se sa përlarje dritaresh"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Këmbe hapësira pune duke përdorur në desktop rrotëzën e _miut"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Madhësia më e _vogël që nxit vendosje të mençur:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Kur një dritare ngre veten:"
+#, fuzzy
+msgid "<i>Large</i>"
+msgstr "Madhësi|<i>E madhe</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Dritaret, si parazgjedhje, vendosi:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Mbështill hapësira pune në varësi të _skemës aktuale për desktopin"
+msgid "At the _center of the screen"
+msgstr "Në _qendër të ekranit"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Mbështill hapësira pune kur mbërrihet te hapësira e _parë apo e fundit e "
-"punës"
+msgid "Under the mouse _pointer"
+msgstr "Nën _treguesin e miut"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Hyrshmëri"
+msgid "_Placement"
+msgstr "_Vendosje"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Bjere dritaren te hapësira e punës e tanishme"
+msgid "_Enable display compositing"
+msgstr "_Aktivizo hartim ekrani"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Vizato kornizë përreth dritareve të përzgjedhura kur cikolhet"
+msgid "Display _fullscreen overlay windows directly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Aktivizo hartim ekrani"
+msgid "Show shadows under _regular windows"
+msgstr "Shfaq hije nën dritare të _rregullta"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Shfaq hije nën dritare _flluckë"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Përfshi dritare të fshehura (d.m.th. të ikonizuara)"
+msgid "Show shadows under _dock windows"
+msgstr "Shfaq hije nën dritare _shtylle"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Madhësia më e _vogël që nxit vendosje të mençur:"
+msgid "Opaci_ty of window decorations:"
+msgstr "_Patejdukshmëri e zbukurimeve të dritareve:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Vendosje"
+msgid "<i>Transparent</i>"
+msgstr "<i>I tejdukshëm</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Ngri dritare kur shtypet çfarëdo butoni miu"
+msgid "<i>Opaque</i>"
+msgstr "<i>I marrtë</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Mbaj mend hapësira të mëparshme pune\n"
-"kur këmbehen përmes shkurtoresh tastiere"
+msgid "Opacity of _inactive windows:"
+msgstr "Patejdukshmëri dritaresh _jovepruese:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Patejdukshmëri dritaresh gjatë _lëvizjesh:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Anashkalo dritare që kanë të caktuar vetinë\n"
-"\"anashkalo faques\" ose \"anashkalo shtyllë veprimesh\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Patejdukshmëri dritaresh gjatë _ripërmasimesh:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Patejdukshmëri _dritaresh flluckë:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Hapësira pune"
+msgid "C_ompositor"
+msgstr "_Hartues"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Mënjana</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Numri i hapësirave të punës:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Hapësira pune</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Emër:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Mënjanat janë zona në skajet e ekranit në të cilat nuk do të vendoset dritare"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Numri i hapësirave të punës:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Mënjana"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -870,37 +880,37 @@ msgstr "_Numri i hapësirave të punës:"
 msgid "%s (on %s)"
 msgstr "%s (në %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Rregullime për Përgjegjës Dritaresh Xfce 4"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "Të dhëna versioni"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1034,6 +1044,15 @@ msgstr "Gabim gjatë leximit të të dhënave prej procesi bijë: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Caktoni numrat dhe emrat e hapësirave të punës"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Mënjana</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Hapësira pune</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Ndryshoni emër hapësire pune"
 
@@ -1261,9 +1280,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Ndrysho emër"
 
-#~ msgid "Name:"
-#~ msgstr "Emër:"
-
 #~ msgid "Number of workspaces:"
 #~ msgstr "Numri i hapësirave të punës:"
 
@@ -1273,9 +1289,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Hapësira pune dhe Mënjana"
 
-#~ msgid "Margins"
-#~ msgstr "Mënjana"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Rregullime Përgjegjësi Dritaresh"
 
diff --git a/po/sv.po b/po/sv.po
index b19fc53..62af623 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-10-17 17:08+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -86,238 +86,238 @@ msgid "Settings manager socket"
 msgstr "Uttag för inställningshanterare"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Konfigurera fönsterbeteende och genvägar"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Fönsterhanterare"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Finjustera fönsterbeteende och effekter"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Konfigurera fönsterbeteende och genvägar"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Justeringar för fönsterhanterare"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Ange antalet och namn för arbetsytor"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Finjustera fönsterbeteende och effekter"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Arbetsytor"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Flyttning och storleksändring</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Knapplayout</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Dubbelklicksåt_gärd</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Fokusmodell</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Typsnitt för tite_l</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Fokus för nya fönster</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>Titel_justering</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Höj vid klick</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Klicka och dra knapparna för att ändra layouten"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Höj vid fokus</b>"
+msgid "Title"
+msgstr "Titel"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>Titel_justering</b>"
+msgid "The window title cannot be removed"
+msgstr "Fönstrets titel kan inte tas bort"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Typsnitt för tite_l</b>"
+msgid "Active"
+msgstr "Aktiva"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Fönstergenv_ägar</b>"
+msgid "Menu"
+msgstr "Meny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Fönsterattraktion</b>"
+msgid "Stick"
+msgstr "Klistra fast"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Byt arbetsyta</b>"
+msgid "Shade"
+msgstr "Rulla upp"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "Mi_nimera"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Maximera"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Lång</i>"
+msgid "Close"
+msgstr "Stäng"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Dolda"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kort</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Knapplayout</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Liten</i>"
+msgid "_Reset to Defaults"
+msgstr "Åte_rställ till standardvärden"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Fönstergenv_ägar</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Bred</i>"
+msgid "Ke_yboard"
+msgstr "Tangent_bord"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktiva"
+msgid "Clic_k to focus"
+msgstr "Klic_ka för att fokusera"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "A_vancerat"
+msgid "Focus follows _mouse"
+msgstr "Fokus följer _musen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Höj automatiskt fönster _när de får fokus"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Ge automatiskt fokus till _nya fönster"
+msgid "_Delay before window receives focus:"
+msgstr "_Fördröjning innan ett fönster får fokus:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Klic_ka för att fokusera"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Klicka och dra knapparna för att ändra layouten"
+msgid "<i>Short</i>"
+msgstr "<i>Kort</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Stäng"
+msgid "<i>Long</i>"
+msgstr "<i>Lång</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Fokusmodell</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Fördröjning _innan ett fokuserat fönster höjs:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Ge automatiskt fokus till _nya fönster"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "A_vstånd:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Fokus för nya fönster</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Fokus följer _musen"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Höj automatiskt fönster _när de får fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Dolda"
+msgid "Delay _before raising focused window:"
+msgstr "Fördröjning _innan ett fokuserat fönster höjs:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Dölj fönsterinnehåll vid _förflyttning"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Höj vid fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Dölj fönsterinnehåll vid _storleksändring"
+msgid "Raise window when clicking _inside application window"
+msgstr "Höj fönstret vid klick _inne i programfönstret"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Tangent_bord"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Höj vid klick</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Maximera"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Meny"
+msgid "Snap windows to screen _border"
+msgstr "Fönster attraheras till skärmens _kant"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "Mi_nimera"
+msgid "Snap windows to other _windows"
+msgstr "Fönster attraheras till _andra fönster"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Höj fönstret vid klick _inne i programfönstret"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Rulla upp"
+msgid "Dis_tance:"
+msgstr "A_vstånd:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Fönster attraheras till _andra fönster"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Fönster attraheras till skärmens _kant"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Liten</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Klistra fast"
+msgid "<i>Wide</i>"
+msgstr "<i>Bred</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Åtgärden att genomföra när titellisten dubbelklickas"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Fönsterattraktion</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Fönstrets titel kan inte tas bort"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Byt arbetsyta när mus_pekaren når skärmens kant"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Titel"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Byt arbetsyta när fönster _dras utanför skärmen"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "_Kantmotstånd:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Byt arbetsyta</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Byt arbetsyta när mus_pekaren når skärmens kant"
+msgid "Hide content of windows when _resizing"
+msgstr "Dölj fönsterinnehåll vid _storleksändring"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "_Fördröjning innan ett fönster får fokus:"
+msgid "Hide content of windows when _moving"
+msgstr "Dölj fönsterinnehåll vid _förflyttning"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "_Kantmotstånd:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Flyttning och storleksändring</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Fokus"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Åtgärden att genomföra när titellisten dubbelklickas"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Åte_rställ till standardvärden"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Dubbelklicksåt_gärd</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "A_vancerat"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -660,206 +660,216 @@ msgstr ""
 "Detta kommer att återställa alla genvägar till sin standardvärden. Vill du "
 "verkligen göra detta?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Stor</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Opak</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"_Hoppa över fönster som har egenskaperna\n"
+"\"skip pager\" eller \"skip taskbar\" inställda"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_Inkludera dolda (alltså ikonifierade) fönster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Genomskinlig</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Växla _mellan fönster på alla arbetsytor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "Aktivera skydd mot att _fokus stjäls"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Rita ramar runt markerade fönster vid växling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "I _mitten av skärmen"
+msgid "C_ycling"
+msgstr "V_äxling"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Placera fönster som standard:"
+msgid "Activate _focus stealing prevention"
+msgstr "Aktivera skydd mot att _fokus stjäls"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "K_ompositeffekter"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Tillämpa _standardiserad \"ICCCM focus hint\""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "V_äxling"
+msgid "When a window raises itself:"
+msgstr "När ett fönster höjer sig själv:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "Växla _mellan fönster på alla arbetsytor"
+msgid "_Bring window on current workspace"
+msgstr "_Flytta fönster till aktuell arbetsyta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Visa överliggande _fönster i helskärm direkt"
+msgid "Switch to win_dow's workspace"
+msgstr "Växla til_l fönstrets arbetsyta"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Gör _ingenting"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Dölj fönst_erramar för maximerade fönster"
+msgid "Key used to _grab and move windows:"
+msgstr "Tangent för att _fånga och flytta fönster:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Tillämpa _standardiserad \"ICCCM focus hint\""
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "_Höj fönster när någon av musknapparna trycks ner"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Låt fönster som kräver uppmärksamhet _blinka upprepat"
+msgid "Hide _frame of windows when maximized"
+msgstr "Dölj fönst_erramar för maximerade fönster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Tangent för att _fånga och flytta fönster:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"Återställ ursprunglig _storlek för maximerade fönster när de förflyttas"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Notifiera _uppmärksamhet genom att låta fönstrets dekoration blinka"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Använd _kantmotstånd istället för fönsterattraktion"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Opaci_tet för fönsterdekorationer:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Notifiera _uppmärksamhet genom att låta fönstrets dekoration blinka"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Opacitet för _inaktiva fönster:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Låt fönster som kräver uppmärksamhet _blinka upprepat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Opacitet för popupfönst_er:"
+msgid "_Accessibility"
+msgstr "_Hjälpmedel"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Opacitet när f_önster förflyttas:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Använd _mushjulet på skrivbordet för att växla arbetsytor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Opacitet när storleken på ett fönster _ändras:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"Återställ ursprunglig _storlek för maximerade fönster när de förflyttas"
+"_Kom ihåg och återkalla föregående\n"
+"arbetsyta vid växling med snabbtangenter"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Visa skuggor under _dockningsfönster"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Byt arbetsyta beroende på aktuell skrivbords_layout"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Visa skuggor under _vanliga fönster"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "Byt arbetsyta när _första eller sista arbetsytan nås"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Visa skuggor under pop_upfönster"
+msgid "_Workspaces"
+msgstr "Ar_betsytor"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Växla til_l fönstrets arbetsyta"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Under mus_pekaren"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Använd _kantmotstånd istället för fönsterattraktion"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Använd _mushjulet på skrivbordet för att växla arbetsytor"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "_Minsta fönsterstorlek för att aktivera smart placering:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "När ett fönster höjer sig själv:"
+msgid "<i>Large</i>"
+msgstr "<i>Stor</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Placera fönster som standard:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Byt arbetsyta beroende på aktuell skrivbords_layout"
+msgid "At the _center of the screen"
+msgstr "I _mitten av skärmen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Byt arbetsyta när _första eller sista arbetsytan nås"
+msgid "Under the mouse _pointer"
+msgstr "Under mus_pekaren"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Hjälpmedel"
+msgid "_Placement"
+msgstr "_Placering"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "_Flytta fönster till aktuell arbetsyta"
+msgid "_Enable display compositing"
+msgstr "_Aktivera kompositeffekter"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Rita ramar runt markerade fönster vid växling"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Visa överliggande _fönster i helskärm direkt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_Aktivera kompositeffekter"
+msgid "Show shadows under _regular windows"
+msgstr "Visa skuggor under _vanliga fönster"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Visa skuggor under pop_upfönster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_Inkludera dolda (alltså ikonifierade) fönster"
+msgid "Show shadows under _dock windows"
+msgstr "Visa skuggor under _dockningsfönster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "_Minsta fönsterstorlek för att aktivera smart placering:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Opaci_tet för fönsterdekorationer:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Placering"
+msgid "<i>Transparent</i>"
+msgstr "<i>Genomskinlig</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "_Höj fönster när någon av musknapparna trycks ner"
+msgid "<i>Opaque</i>"
+msgstr "<i>Opak</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"_Kom ihåg och återkalla föregående\n"
-"arbetsyta vid växling med snabbtangenter"
+msgid "Opacity of _inactive windows:"
+msgstr "Opacitet för _inaktiva fönster:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Opacitet när f_önster förflyttas:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"_Hoppa över fönster som har egenskaperna\n"
-"\"skip pager\" eller \"skip taskbar\" inställda"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Opacitet när storleken på ett fönster _ändras:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Opacitet för popupfönst_er:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Ar_betsytor"
+msgid "C_ompositor"
+msgstr "K_ompositeffekter"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Marginaler</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "A_ntal arbetsytor:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Arbetsytor</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "Namn:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Marginaler är områden vid skärmens kanter där inga fönster kommer att "
 "placeras"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "A_ntal arbetsytor:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Marginaler"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -867,35 +877,35 @@ msgstr "A_ntal arbetsytor:"
 msgid "%s (on %s)"
 msgstr "%s (på %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Kör i bakgrunden"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Kör i bakgrunden (stöds inte)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Ställ in compositor-läge"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Ställ in compositor-läge (stöds inte)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Ersätt befintlig fönsterhanterare"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[ARGUMENT...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Skriv \"%s --help\" för användningsinformation."
@@ -1027,6 +1037,15 @@ msgstr "Fel vid läsning av data från underprocess: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Kan inte starta helper-dialog: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Ange antalet och namn för arbetsytor"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Marginaler</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Arbetsytor</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Byt namn på arbetsyta"
 
@@ -1209,9 +1228,6 @@ msgstr "Kan inte starta helper-dialog: %s\n"
 #~ msgid "Change name"
 #~ msgstr "Byt namn"
 
-#~ msgid "Name:"
-#~ msgstr "Namn:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Klicka på en arbetsyta för att redigera dess namn"
 
@@ -1227,9 +1243,6 @@ msgstr "Kan inte starta helper-dialog: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Arbetsytor och marginaler"
 
-#~ msgid "Margins"
-#~ msgstr "Marginaler"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Inställningar för Fönsterhanteraren"
 
diff --git a/po/ta.po b/po/ta.po
index 2997ca1..718ea44 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2005-10-09 20:53+0900\n"
 "Last-Translator: Dinesh Nadarajah <n_dinesh at yahoo.com>\n"
 "Language-Team: Tamil <tamilinix at yahoogroups.com>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -78,284 +78,283 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "சாளரமேலாளர்"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 #, fuzzy
 msgid "Window Manager Tweaks"
 msgstr "சாளரமேலாளர்"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "வேலை þடங்கள் மடிப்பு"
+msgid "Fine-tune window behaviour and effects"
+msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 #, fuzzy
 msgid "Workspaces"
 msgstr "வேலை þடம் %i"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "ஒளி பாயாத அளவு மாற்றமும் நகர்த்துதலும்"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "பொத்தான் அமைப்பு"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "þரட்டை அமுத்தல் செயல்"
+msgid "<b>_Theme</b>"
+msgstr "தலைப்பு þடம் அமைப்பு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "சாளரம் பெறும் முறைமை"
+msgid "<b>Title fon_t</b>"
+msgstr "தலைப்பு எழுத்துரு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "புதிய சாளரத்திற்கு"
+msgid "<b>Title _alignment</b>"
+msgstr "தலைப்பு þடம் அமைப்பு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "அமுத்தும் போது உயர்த்து"
+msgid "Click and drag the buttons to change the layout"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "கைப்பிடிப்பு/உயர்த்தல்"
+msgid "Title"
+msgstr "தலைப்பு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "தலைப்பு þடம் அமைப்பு"
+msgid "The window title cannot be removed"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "தலைப்பு எழுத்துரு"
+msgid "Active"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "சாளரம் பாணி"
+msgid "Menu"
+msgstr "பட்டி"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "சாளரங்கள் போடுதல்"
+msgid "Stick"
+msgstr "ஒட்டு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "வேலை þடங்கள் மடிப்பு"
+msgid "Shade"
+msgstr "நிழல் தரம்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "தலைப்பு þடம் அமைப்பு"
+msgid "Minimize"
+msgstr "பெருதாக்குக"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "பெருதாக்கு"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "மூடு"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "மறைந்தது"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr ""
+#, fuzzy
+msgid "<b>Button layout</b>"
+msgstr "பொத்தான் அமைப்பு"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "தலைப்பு"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "அருகில்"
+msgid "<b>Window _shortcuts</b>"
+msgstr "சாளரம் பாணி"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "தூரம் :"
+msgid "Ke_yboard"
+msgstr "விசைப்பலகை குறுக்கு வழி"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr ""
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "அமுக்கவேண்டும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "உயர்நிலை"
+msgid "Focus follows _mouse"
+msgstr "சுட்டி þருக்குமிடத்தில்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"சாளரங்களுக்கு கைப்பிடி கிடைக்கும்போது \n"
-"அவைகளை தானாக மேல் உயர்த்தவும்"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr ""
-"புதிதாக படைக்கப்பட்ட சாளரங்களுக்கு \n"
-"தானாக சுட்டி கைப்பிடி கொடுக்கவும்"
+msgid "_Delay before window receives focus:"
+msgstr "சாளரத்தை உயர்த்தும் தாமதம் :"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
-msgid "Clic_k to focus"
-msgstr "அமுக்கவேண்டும்"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+msgid "<i>Short</i>"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "மூடு"
+msgid "<i>Long</i>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "சாளரம் பெறும் முறைமை"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "சாளரத்தை உயர்த்தும் தாமதம் :"
+msgid "Automatically give focus to _newly created windows"
+msgstr ""
+"புதிதாக படைக்கப்பட்ட சாளரங்களுக்கு \n"
+"தானாக சுட்டி கைப்பிடி கொடுக்கவும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "தூரம் :"
+msgid "<b>New window focus</b>"
+msgstr "புதிய சாளரத்திற்கு"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "சுட்டி þருக்குமிடத்தில்"
+msgid "Automatically _raise windows when they receive focus"
+msgstr ""
+"சாளரங்களுக்கு கைப்பிடி கிடைக்கும்போது \n"
+"அவைகளை தானாக மேல் உயர்த்தவும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "மறைந்தது"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "சாளரத்தை உயர்த்தும் தாமதம் :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "<b>Raise on focus</b>"
+msgstr "கைப்பிடிப்பு/உயர்த்தல்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "Raise window when clicking _inside application window"
+msgstr ""
+"நிரல் சாளரத்திற்குள் அமுத்தும்போது\n"
+"சாளரத்தை உயர்த்து"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "விசைப்பலகை குறுக்கு வழி"
+msgid "<b>Raise on click</b>"
+msgstr "அமுத்தும் போது உயர்த்து"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "பெருதாக்கு"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "சாளரம் பெறும் முறைமை"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "பட்டி"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "சாளரங்களை திறை எல்லையுடன் போடுக"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "பெருதாக்குக"
+msgid "Snap windows to other _windows"
+msgstr "சாளரங்களை மற்ற சாளரங்களுடன் போடுக"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr ""
-"நிரல் சாளரத்திற்குள் அமுத்தும்போது\n"
-"சாளரத்தை உயர்த்து"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "நிழல் தரம்"
+msgid "Dis_tance:"
+msgstr "தூரம் :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "சாளரங்களை மற்ற சாளரங்களுடன் போடுக"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "சாளரங்களை திறை எல்லையுடன் போடுக"
+msgid "<i>Small</i>"
+msgstr "அருகில்"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "ஒட்டு"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "தூரம் :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "தலைப்புப் பட்டையில் þரட்டை அமுத்தல் செயல் :"
+msgid "<b>Windows snapping</b>"
+msgstr "சாளரங்கள் போடுதல்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "சுட்டி அம்பு திரை எல்லையை அடைந்தவுடன் வேலைஃþடத்தைஃமடிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "தலைப்பு"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "ஓர் சாளரத்தை திரை எல்லைக்கு வெளியே þழுக்கும் போது வேலை þடத்தை மடி"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "விளிம்பு மறிப்பு :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "வேலை þடங்கள் மடிப்பு"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "சுட்டி அம்பு திரை எல்லையை அடைந்தவுடன் வேலைஃþடத்தைஃமடிக்கவும்"
+msgid "Hide content of windows when _resizing"
+msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "சாளரத்தை உயர்த்தும் தாமதம் :"
+msgid "Hide content of windows when _moving"
+msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "விளிம்பு மறிப்பு :"
+msgid "<b>Box move and resize</b>"
+msgstr "ஒளி பாயாத அளவு மாற்றமும் நகர்த்துதலும்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "சாளரம் பெறும் முறைமை"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "தலைப்புப் பட்டையில் þரட்டை அமுத்தல் செயல் :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "þரட்டை அமுத்தல் செயல்"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "தலைப்பு"
+msgid "Ad_vanced"
+msgstr "உயர்நிலை"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -751,48 +750,50 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr ""
+#, fuzzy
+msgid "Cycle _through windows on all workspaces"
+msgstr "புதிய சாளரத்திற்கு"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
-msgid "C_ompositor"
-msgstr "விசைப்பலகை குறுக்கு வழி"
+msgid "Honor _standard ICCCM focus hint"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr "புதிய சாளரத்திற்கு"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+#, fuzzy
+msgid "Switch to win_dow's workspace"
+msgstr "புதிய சாளரத்திற்கு"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -800,166 +801,171 @@ msgid "Do _nothing"
 msgstr "ஏதும் þல்லை"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr ""
+#, fuzzy
+msgid "Restore original _size of maximized windows when moving"
+msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "_Accessibility"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr ""
+#, fuzzy
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "சுட்டி அம்பு திரை எல்லையை அடைந்தவுடன் வேலைஃþடத்தைஃமடிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "புதிய சாளரத்திற்கு"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Workspaces"
+msgstr "வேலை þடம் %i"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "சுட்டி அம்பு திரை எல்லையை அடைந்தவுடன் வேலைஃþடத்தைஃமடிக்கவும்"
+msgid "Under the mouse _pointer"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "புதிய சாளரத்திற்கு"
+msgid "_Enable display compositing"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+#, fuzzy
+msgid "Opaci_ty of window decorations:"
+msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
+msgid "<i>Transparent</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Opacity of _inactive windows:"
+msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
+#, fuzzy
+msgid "Opacity of windows during resi_ze:"
+msgstr "சாளரத்தின் அளவு மாற்றும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
 #, fuzzy
-msgid "_Workspaces"
-msgstr "வேலை þடம் %i"
+msgid "Opacity of popup window_s:"
+msgstr "சாளரத்தை நகர்த்தும் போது உள்ளடக்கங்களை காண்பிக்கவும்"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "கைப்பிடிப்பு/உயர்த்தல்"
+msgid "C_ompositor"
+msgstr "விசைப்பலகை குறுக்கு வழி"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Workspaces</b>"
+msgid "_Number of workspaces:"
 msgstr "வேலை þடங்கள் மடிப்பு"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "சாளரங்கள் எவையும் திரை எல்லைகளில் போடப்படாது"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "வேலை þடங்கள் மடிப்பு"
+msgid "_Margins"
+msgstr "கைப்பிடிப்பு/உயர்த்தல்"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -967,36 +973,36 @@ msgstr "வேலை þடங்கள் மடிப்பு"
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "சாளரமேலாளர்"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1135,6 +1141,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "வேலை þடங்கள் மடிப்பு"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "கைப்பிடிப்பு/உயர்த்தல்"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "வேலை þடங்கள் மடிப்பு"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "வேலையிட எல்லைகள்"
 
@@ -1260,10 +1278,6 @@ msgstr ""
 #~ msgstr "வேலையிட எல்லைகள்"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "கைப்பிடிப்பு/உயர்த்தல்"
-
-#, fuzzy
 #~ msgid "Window Manager Settings"
 #~ msgstr "சாளரமேலாளர்"
 
diff --git a/po/te.po b/po/te.po
index 9be01ed..3148862 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-07-13 17:35+0530\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu at lists.sourceforge.net>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -78,238 +78,238 @@ msgid "Settings manager socket"
 msgstr "అమరికల నిర్వాహకము సాకెట్"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr ""
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "విండో నిర్వాహకం"
 
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr ""
+
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
+msgid "Window Manager Tweaks"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
-msgid "Window Manager Tweaks"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
 msgstr ""
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "కార్యక్షేత్రాల యొక్క సంఖ్య మరియు పేర్లను అమర్చు"
-
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "కార్యక్షేత్రాలు"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
+msgid "<b>_Theme</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
+msgid "<b>Title fon_t</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
+msgid "<b>Title _alignment</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
+msgid "Click and drag the buttons to change the layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr ""
+msgid "Title"
+msgstr "శీర్షిక"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
+msgid "The window title cannot be removed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr ""
+msgid "Active"
+msgstr "క్రియాశీల"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr ""
+msgid "Menu"
+msgstr "మెను"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
+msgid "Stick"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
+msgid "Shade"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr ""
+#, fuzzy
+msgid "Minimize"
+msgstr "కనిష్ఠీకరించు (_n)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "గరిష్ఠీకరించు"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr ""
+msgid "Close"
+msgstr "మూసివేయి"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "దాయబడిన"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
+msgid "<b>Button layout</b>"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
 msgstr ""
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
+msgid "_Reset to Defaults"
+msgstr "అప్రమేయాలకు తిరిగిఅమర్చు(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
 msgstr ""
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr ""
+msgid "Ke_yboard"
+msgstr "కీబోర్డు (_y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "క్రియాశీల"
+msgid "Clic_k to focus"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "అధునాతన (_v)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
+msgid "Focus follows _mouse"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:24
+msgid "_Delay before window receives focus:"
 msgstr ""
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
+msgid "<i>Short</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
+msgid "<i>Long</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "మూసివేయి"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
+msgid "Automatically give focus to _newly created windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
+msgid "<b>New window focus</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
+msgid "Automatically _raise windows when they receive focus"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "దాయబడిన"
+msgid "Delay _before raising focused window:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
+msgid "<b>Raise on focus</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
+msgid "Raise window when clicking _inside application window"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "కీబోర్డు (_y)"
+msgid "<b>Raise on click</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "గరిష్ఠీకరించు"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "మెను"
+msgid "Snap windows to screen _border"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "కనిష్ఠీకరించు (_n)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
+msgid "Snap windows to other _windows"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:40
+msgid "Dis_tance:"
 msgstr ""
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
 msgstr ""
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
+msgid "<i>Wide</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
+msgid "<b>Windows snapping</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "శీర్షిక"
+msgid "Wrap workspaces when _dragging a window off the screen"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-msgid "Wrap workspaces when _dragging a window off the screen"
+msgid "<b>Wrap workspaces</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgid "Hide content of windows when _resizing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
+msgid "Hide content of windows when _moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
+msgid "<b>Box move and resize</b>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
+msgid "The action to perform when the title-bar is double-clicked"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "అప్రమేయాలకు తిరిగిఅమర్చు(_R)"
+msgid "<b>Double click _action</b>"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr ""
+msgid "Ad_vanced"
+msgstr "అధునాతన (_v)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -650,45 +650,46 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>పారదర్శకం</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
+msgid "C_ycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
+msgid "When a window raises itself:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
+msgid "_Bring window on current workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
+msgid "Switch to win_dow's workspace"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
@@ -696,153 +697,162 @@ msgid "Do _nothing"
 msgstr "ఏమీచేయవద్దు (_n)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
+msgid "Key used to _grab and move windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
+msgid "_Raise windows when any mouse button is pressed"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
+msgid "Restore original _size of maximized windows when moving"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
+msgid "Use _edge resistance instead of window snapping"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
+msgid "Notify of _urgency by making window's decoration blink"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
+msgid "Keep urgent windows _blinking repeatedly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
+msgid "_Accessibility"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
+msgid "Wrap workspaces depending on the actual desktop _layout"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr ""
+msgid "_Workspaces"
+msgstr "కార్యక్షేత్రాలు (_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
+msgid "_Minimum size of windows to trigger smart placement:"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
+msgid "<i>Large</i>"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+msgid "At the _center of the screen"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
+msgid "_Placement"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
+msgid "_Enable display compositing"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
+msgid "Show shadows under _regular windows"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
+msgid "Show shadows under _dock windows"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
+msgid "Opaci_ty of window decorations:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr ""
+msgid "<i>Transparent</i>"
+msgstr "<i>పారదర్శకం</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
+msgid "<i>Opaque</i>"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
+msgid "Opacity of _inactive windows:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
+msgid "Opacity of windows during resi_ze:"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "కార్యక్షేత్రాలు (_W)"
+msgid "C_ompositor"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>అంచులు</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>కార్యక్షేత్రాలు</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "పేరు (_N):"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr ""
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>అంచులు</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -850,35 +860,35 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr ""
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "రూపాంతరము సమాచారం ముద్రించు మరియు నిష్క్రమించు"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "వాడుకకు '%s --help' టైపు చేయండి."
@@ -1010,11 +1020,14 @@ msgstr ""
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "కార్యక్షేత్రాల యొక్క సంఖ్య మరియు పేర్లను అమర్చు"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>కార్యక్షేత్రాలు</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "కార్యక్షేత్రము పేరు మార్చు"
 
-#~ msgid "_Name:"
-#~ msgstr "పేరు (_N):"
-
 #~ msgid "Hide"
 #~ msgstr "దాయి"
diff --git a/po/tr.po b/po/tr.po
index 65832b6..225372d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,23 +2,23 @@
 # Turkish translations for xfwm4 package.
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
-# 
+#
 # Erçin EKER <erc.caldera at gmx.net>, 2003.
 # Eren Türkay <turkay.eren at gmail.com>, 2007.
 # Gökmen Görgen <gkmngrgn at gmail.com>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-04 14:06+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-01-30 21:31+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -86,237 +86,237 @@ msgid "Settings manager socket"
 msgstr "Ayarlar yöneticisi yuvası"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Pencere davranışı ve kısayollarını yapılandır"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Pencere Yöneticisi"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Pencere davranışı ve olaylarını ayarla"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Pencere davranışı ve kısayollarını yapılandır"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Pencere Yöneticisi İnce Ayarları"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Çalışma alanlarının isim ve sayılarını belirt"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Pencere davranışı ve olaylarını ayarla"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Çalışma Alanları"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Kutu taşıma ve boyutlandırma</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Düğme yerleşimi</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>Çift tıkl_ama eylemi</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Tema</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Odaklama biçimi</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>Başlık ya_zıtipi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Yeni pencere odaklaması</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>B_aşlık hizalaması</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Tıklarken yükselt</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Yerleşimi değiştirmek için düğmeye tıklayın ve sürükleyin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Odaklarken yükselt</b>"
+msgid "Title"
+msgstr "Başlık"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>B_aşlık hizalaması</b>"
+msgid "The window title cannot be removed"
+msgstr "Pencere başlığı silinemez"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>Başlık ya_zıtipi</b>"
+msgid "Active"
+msgstr "Aktif"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>Pencere kı_sayolları</b>"
+msgid "Menu"
+msgstr "Menü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Pencere yerleştirme</b>"
+msgid "Stick"
+msgstr "Sabitle"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Çalışma alanlarını değiştir</b>"
+msgid "Shade"
+msgstr "Gölgele"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Tema</b>"
+msgid "Minimize"
+msgstr "Küçült"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Büyüt"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Uzunz/i>"
+msgid "Close"
+msgstr "Kapat"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Gizli"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Kısa</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Düğme yerleşimi</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Stil"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Küçük</i>"
+msgid "_Reset to Defaults"
+msgstr "Öntanımlı Aya_rlara Geri Dön"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>Pencere kı_sayolları</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Geniş</i>"
+msgid "Ke_yboard"
+msgstr "Klav_ye"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Aktif"
+msgid "Clic_k to focus"
+msgstr "Oda_klama için tıklansın"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Geliş_miş"
+msgid "Focus follows _mouse"
+msgstr "Odak fareyi takip etsi_n"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Pencereler odaklanma kazanınca otomatik olarak yü_kselt"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Yeni pencereye kendiliğinden odakla_n"
+msgid "_Delay before window receives focus:"
+msgstr "Pencere odaklama gecikmesi:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Oda_klama için tıklansın"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Yerleşimi değiştirmek için düğmeye tıklayın ve sürükleyin"
+msgid "<i>Short</i>"
+msgstr "<i>Kısa</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Kapat"
+msgid "<i>Long</i>"
+msgstr "<i>Uzunz/i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Odaklama biçimi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Odaklanmış pencereyi _büyütme gecikmesi:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Yeni pencereye kendiliğinden odakla_n"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Uza_klık :"
+msgid "<b>New window focus</b>"
+msgstr "<b>Yeni pencere odaklaması</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Odak fareyi takip etsi_n"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Pencereler odaklanma kazanınca otomatik olarak yü_kselt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Gizli"
+msgid "Delay _before raising focused window:"
+msgstr "Odaklanmış pencereyi _büyütme gecikmesi:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Pe_ncereleri taşırken içeriğini gizle"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Odaklarken yükselt</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Pence_releri yeniden boyutlandırıken içeriğini gizle"
+msgid "Raise window when clicking _inside application window"
+msgstr "Uygulama penceres_inin içine tıklayınca pencereyi yükselt"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "Klav_ye"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Tıklarken yükselt</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Büyüt"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_Odak"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Menü"
+msgid "Snap windows to screen _border"
+msgstr "Pencereleri ekran kenarına _daya"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Küçült"
+msgid "Snap windows to other _windows"
+msgstr "Pen_cereleri diğerlerine daya"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Uygulama penceres_inin içine tıklayınca pencereyi yükselt"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Gölgele"
+msgid "Dis_tance:"
+msgstr "Uza_klık :"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Pen_cereleri diğerlerine daya"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Pencereleri ekran kenarına _daya"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Küçük</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Sabitle"
+msgid "<i>Wide</i>"
+msgstr "<i>Geniş</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Başlık çubuğuna çift tıklandığında uygulanacak eylem"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Pencere yerleştirme</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Pencere başlığı silinemez"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "İmleç ekran kenarına geldiğinde çalışma alanını değiş_tir"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Başlık"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 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"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "K_enar direnci :"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Çalışma alanlarını değiştir</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "İmleç ekran kenarına geldiğinde çalışma alanını değiş_tir"
+msgid "Hide content of windows when _resizing"
+msgstr "Pence_releri yeniden boyutlandırıken içeriğini gizle"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Pencere odaklama gecikmesi:"
+msgid "Hide content of windows when _moving"
+msgstr "Pe_ncereleri taşırken içeriğini gizle"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "K_enar direnci :"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Kutu taşıma ve boyutlandırma</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_Odak"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Başlık çubuğuna çift tıklandığında uygulanacak eylem"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Öntanımlı Aya_rlara Geri Dön"
+msgid "<b>Double click _action</b>"
+msgstr "<b>Çift tıkl_ama eylemi</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Stil"
+msgid "Ad_vanced"
+msgstr "Geliş_miş"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -654,203 +654,213 @@ msgstr ""
 "Bu, tüm kısayolları öntanımlı değerlerine geri döndürecek. Bunu yapmak "
 "istediğinizden emin misiniz?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Büyük</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Mat</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"sayfalayıcıyı atla\" veya \"görev çubuğunu atla\"\n"
+"seçenekleri ayarlanmış olan pencereleri a_tla"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "G_izlenmiş (ör: simgelenmiş) pencereleri içine al"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Saydam</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "_Tüm çalışma alanları içinde pencereler arasında gezin"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "_Odaklama çalma korumasını etkinleştir"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "Pencere _değiştirme sırasında, pencereleri çerçeve içine al"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "Ekranın merkezin_de"
+msgid "C_ycling"
+msgstr "Gez_inme"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Pencereleri öntanımlı yerleştir:"
+msgid "Activate _focus stealing prevention"
+msgstr "_Odaklama çalma korumasını etkinleştir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "B_irleştirici"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "_Standart ICCCM odaklama ipucunu kabul et"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Gez_inme"
+msgid "When a window raises itself:"
+msgstr "Pencere kendisini büyülttüğünde:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "_Tüm çalışma alanları içinde pencereler arasında gezin"
+msgid "_Bring window on current workspace"
+msgstr "Şuanki çalışma alanından _pencereyi al"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Doğrudan tam ekran pencereleri gö_ster"
+msgid "Switch to win_dow's workspace"
+msgstr "Pencerenin çalışma alanına gön_der"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Hiçbir şey yap_ma"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Büyütüldüğünde pencerelerin çerçevesini gizle"
+msgid "Key used to _grab and move windows:"
+msgstr "Pen_cereleri yakalamak ve taşımak için tuş:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "_Standart ICCCM odaklama ipucunu kabul et"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "He_rhangi bir fare tuşuna basıldığında pencereleri yükselt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Acil _durum uyarısı veren pencereleri yanıp söner halde tut"
+msgid "Hide _frame of windows when maximized"
+msgstr "Büyütüldüğünde pencerelerin çerçevesini gizle"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Pen_cereleri yakalamak ve taşımak için tuş:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Pencereleri taşırken büyütülmüş olan pencereyi a_sıl haline getir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Pencere kenarlığının yanıp sönmesiyle acil durum bildirisi"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "P_encereleri koparmak yerine kenarlık direncini kullan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "_Pencere kenarlıklarının saydamsızlığı:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Pencere kenarlığının yanıp sönmesiyle acil durum bildirisi"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Etk_in olmayan pencerelerin saydamsızlığı:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Acil _durum uyarısı veren pencereleri yanıp söner halde tut"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Yeni açılan pencerelerin _saydamsızlığı:"
+msgid "_Accessibility"
+msgstr "_Erişilebilirlik"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Taşırken pe_ncerelerin saydamsızlığı:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Çalış_ma alanlarını değiştirmek için fare tekerini kullan"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Yeniden boyutlandırırken pencerelerin saydamsı_zlığı:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Pencereleri taşırken büyütülmüş olan pencereyi a_sıl haline getir"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Klavye kısayolları ile geçiş yaparken\n"
+"önceki çalışma alanını hatırla ve çağır"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Açılan pencereler altında gölgeleri _göster"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Günce_l masaüstü yerleşimine bağlı olarak çalışma alanlarını kaydır"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Normal pencereler altında gölge göste_r"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "İlk veya son çalış_ma alanı uzadığında çalışma alanlarını kaydır"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Açılan pencereler altında gölge göst_er"
+msgid "_Workspaces"
+msgstr "Ça_lışma alanları"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Pencerenin çalışma alanına gön_der"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "_Fare imlecinin altında"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "P_encereleri koparmak yerine kenarlık direncini kullan"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Çalış_ma alanlarını değiştirmek için fare tekerini kullan"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Akıllı konu_mlandırmayı tetiklemek için pencerelerin en az büyüklüğü:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Pencere kendisini büyülttüğünde:"
+msgid "<i>Large</i>"
+msgstr "<i>Büyük</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Pencereleri öntanımlı yerleştir:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Günce_l masaüstü yerleşimine bağlı olarak çalışma alanlarını kaydır"
+msgid "At the _center of the screen"
+msgstr "Ekranın merkezin_de"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "İlk veya son çalış_ma alanı uzadığında çalışma alanlarını kaydır"
+msgid "Under the mouse _pointer"
+msgstr "_Fare imlecinin altında"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Erişilebilirlik"
+msgid "_Placement"
+msgstr "_Konumlandırma"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Şuanki çalışma alanından _pencereyi al"
+msgid "_Enable display compositing"
+msgstr "Görüntü düzenlemeyi _etkinleştir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "Pencere _değiştirme sırasında, pencereleri çerçeve içine al"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Doğrudan tam ekran pencereleri gö_ster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Görüntü düzenlemeyi _etkinleştir"
+msgid "Show shadows under _regular windows"
+msgstr "Normal pencereler altında gölge göste_r"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Açılan pencereler altında gölge göst_er"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "G_izlenmiş (ör: simgelenmiş) pencereleri içine al"
+msgid "Show shadows under _dock windows"
+msgstr "Açılan pencereler altında gölgeleri _göster"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Akıllı konu_mlandırmayı tetiklemek için pencerelerin en az büyüklüğü:"
+msgid "Opaci_ty of window decorations:"
+msgstr "_Pencere kenarlıklarının saydamsızlığı:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Konumlandırma"
+msgid "<i>Transparent</i>"
+msgstr "<i>Saydam</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "He_rhangi bir fare tuşuna basıldığında pencereleri yükselt"
+msgid "<i>Opaque</i>"
+msgstr "<i>Mat</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Klavye kısayolları ile geçiş yaparken\n"
-"önceki çalışma alanını hatırla ve çağır"
+msgid "Opacity of _inactive windows:"
+msgstr "Etk_in olmayan pencerelerin saydamsızlığı:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Taşırken pe_ncerelerin saydamsızlığı:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"sayfalayıcıyı atla\" veya \"görev çubuğunu atla\"\n"
-"seçenekleri ayarlanmış olan pencereleri a_tla"
+msgid "Opacity of windows during resi_ze:"
+msgstr "Yeniden boyutlandırırken pencerelerin saydamsı_zlığı:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Yeni açılan pencerelerin _saydamsızlığı:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "Ça_lışma alanları"
+msgid "C_ompositor"
+msgstr "B_irleştirici"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Boşluklar</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "Çalışma ala_nlarının sayısı:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Çalışma alanları</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "İsim:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Sınırlar, ekranın kenarlarında pencere yerleştirilmeyecek bölgelerdir."
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "Çalışma ala_nlarının sayısı:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "Boşluklar"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -1018,6 +1028,15 @@ msgstr "Alt işlemden veri okunamadı: %s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Yardımcı menü oluşturulamadı: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Çalışma alanlarının isim ve sayılarını belirt"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>Boşluklar</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Çalışma alanları</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Çalışma alanı ismini değiştir"
 
@@ -1207,9 +1226,6 @@ msgstr "Yardımcı menü oluşturulamadı: %s\n"
 #~ msgid "Change name"
 #~ msgstr "İsim değiştir"
 
-#~ msgid "Name:"
-#~ msgstr "İsim:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Çalışma alanı adını düzenlemek için üzerine tıklayın."
 
@@ -1225,9 +1241,6 @@ msgstr "Yardımcı menü oluşturulamadı: %s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Çalışma Alanları ve Sınırlar"
 
-#~ msgid "Margins"
-#~ msgstr "Boşluklar"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Pencere Yöneticisi Ayarları"
 
diff --git a/po/ug.po b/po/ug.po
index 15f50b0..66b2072 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.5.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-10-11 17:11+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team:Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -84,244 +84,244 @@ msgid "Settings manager socket"
 msgstr "manager socket نىڭ تەڭشەكلىرى"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "كۆزنەك ھەرىكىتى ۋە تېزلەتمىنى سەپلەش"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "كۆزنەك باشقۇرغۇ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "كۆزنەك ھەرىكىتى ۋە ئۈنۈمىنى ئىنچىكە تەڭشەش"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "كۆزنەك ھەرىكىتى ۋە تېزلەتمىنى سەپلەش"
 
 # FIXME: Q_()
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "كۆزنەك باشقۇرغۇ (Tweaks)"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "خىزمەت مۇھىتىنىڭ ئاتى ۋە سانىنى بەلگىلەش"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "كۆزنەك ھەرىكىتى ۋە ئۈنۈمىنى ئىنچىكە تەڭشەش"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "خىزمەت مۇھىتلىرى"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>يۆتكەش ۋە چوڭلۇقىنى ئۆزگەرتىش</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>توپچىنىڭ ئورۇنلاشتۇرۇلۇشى</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>قوش چېكىلگەندىكى ھەرىكەت</b>(_A)"
+msgid "<b>_Theme</b>"
+msgstr "<b>ئۇسلۇب</b>(_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>فوكۇس model</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>ماۋزۇ فونتى</b>(_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>يېڭى كۆزنەكنىڭ فوكۇسى</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>ماۋزۇنىڭ ئورنى</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>چېكىلگەندە كۆتۈرۈلسۇن</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "توپچىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئۆزگەرتىش ئۈچۈن چېكىپ سۆرەڭ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>فوكۇسلانغاندا كۆتۈرۈلسۇن</b>"
+msgid "Title"
+msgstr "ماۋزۇ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>ماۋزۇنىڭ ئورنى</b>(_A)"
+msgid "The window title cannot be removed"
+msgstr "كۆزنەك ماۋزۇسىنى يۆتكىگىلى بولمايدۇ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>ماۋزۇ فونتى</b>(_T)"
+msgid "Active"
+msgstr "ئاكتىپ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>كۆزنەكنىڭ تېزلەتمە كۇنۇپكىلىرى</b>(_S)"
+msgid "Menu"
+msgstr "تىزىملىك"
 
+# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>كۆزنەك snapping</b>"
+msgid "Stick"
+msgstr "چاپلا"
 
+# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>خىمەت مۇھىتلىرىنى قاتلاش</b>"
+msgid "Shade"
+msgstr "سايە"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>ئۇسلۇب</b>(_T)"
+#, fuzzy
+msgid "Minimize"
+msgstr "ئەڭ كىچىك قىل(_N)"
+
+# FIXME:
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "ئەڭ چوڭ قىلىش"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>ئۇزۇن</i>"
+msgid "Close"
+msgstr "تاقا"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "يوشۇرۇن"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>قىسقا</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>توپچىنىڭ ئورۇنلاشتۇرۇلۇشى</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "ئۇسلۇب(_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>كىچىك</i>"
+msgid "_Reset to Defaults"
+msgstr "كۆڭۈلدىكىگە قايتۇر(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>كۆزنەكنىڭ تېزلەتمە كۇنۇپكىلىرى</b>(_S)"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>كەڭرى</i>"
+msgid "Ke_yboard"
+msgstr "ھەرپتاختا(_Y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "ئاكتىپ"
+msgid "Clic_k to focus"
+msgstr "چېكىلگەندە فوكۇسلانسۇن(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "ئالىي(_V)"
+msgid "Focus follows _mouse"
+msgstr "چاشقىنەككە ئەگىشىپ فوكۇسلانسۇن(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "كۆزنەك فوكۇسلانغاندا ئاپتوماتىك كۆتۈرۈلسۇن(_R)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "يېڭى كۆزنەك قۇرۇلغاندا ئاپتوماتىك فوكۇسلانسۇن(_N)"
+msgid "_Delay before window receives focus:"
+msgstr "فوكۇسلانغۇچە بولغان ۋاقىت(_D)"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "چېكىلگەندە فوكۇسلانسۇن(_K)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "توپچىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئۆزگەرتىش ئۈچۈن چېكىپ سۆرەڭ"
+msgid "<i>Short</i>"
+msgstr "<i>قىسقا</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "تاقا"
+msgid "<i>Long</i>"
+msgstr "<i>ئۇزۇن</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>فوكۇس model</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "فۇكۇسلىنىپ كۆتۈرۈلگۈچە بولغان ۋاقىت(_B):"
+msgid "Automatically give focus to _newly created windows"
+msgstr "يېڭى كۆزنەك قۇرۇلغاندا ئاپتوماتىك فوكۇسلانسۇن(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "ئارىلىق(_T):"
+msgid "<b>New window focus</b>"
+msgstr "<b>يېڭى كۆزنەكنىڭ فوكۇسى</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "چاشقىنەككە ئەگىشىپ فوكۇسلانسۇن(_M)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "كۆزنەك فوكۇسلانغاندا ئاپتوماتىك كۆتۈرۈلسۇن(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "يوشۇرۇن"
+msgid "Delay _before raising focused window:"
+msgstr "فۇكۇسلىنىپ كۆتۈرۈلگۈچە بولغان ۋاقىت(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "كۆزنەكنى يۆتكەۋاتقاندا مەزمۇنى كۆرۈنمىسۇن(_M)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>فوكۇسلانغاندا كۆتۈرۈلسۇن</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "كۆزنەكنىڭ چوڭلۇقىنى ئۆزگەرتىۋاتقاندا مەزمۇنى كۆرۈنمىسۇن(_R)"
+msgid "Raise window when clicking _inside application window"
+msgstr "پروگرامما كۆزنىكى ئىچىدە چېكىلگەندە كۆزنەك كۆتۈرۈلسۇن(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "ھەرپتاختا(_Y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>چېكىلگەندە كۆتۈرۈلسۇن</b>"
 
-# FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "ئەڭ چوڭ قىلىش"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "فوكۇس(_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "تىزىملىك"
+msgid "Snap windows to screen _border"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "ئەڭ كىچىك قىل(_N)"
+msgid "Snap windows to other _windows"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "پروگرامما كۆزنىكى ئىچىدە چېكىلگەندە كۆزنەك كۆتۈرۈلسۇن(_I)"
-
-# FIXME:
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "سايە"
+msgid "Dis_tance:"
+msgstr "ئارىلىق(_T):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr ""
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>كىچىك</i>"
 
-# FIXME:
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "چاپلا"
+msgid "<i>Wide</i>"
+msgstr "<i>كەڭرى</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "ماۋزۇ تاياقچىسى قوش چېكىلگەندە مەزكۇر ھەرىكەت ئېلىپ بېرىلىدۇ"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>كۆزنەك snapping</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "كۆزنەك ماۋزۇسىنى يۆتكىگىلى بولمايدۇ"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr ""
+"چاشقىنەك بەلگىسى ئەكران گىرۋىكىگە يەتىپ بارغاندا خىزمەت مۇھىتلىرىنى قاتلا(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "ماۋزۇ"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "بىر كوزنەكنى ئەكراندىن تۇتۇپ ئەلىپ چىقىپ كەتكەندەخىزمەت مۇھىتلىرىنى قاتلا(_D)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "گىرۋەك قارىشلىقى(_E):"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>خىمەت مۇھىتلىرىنى قاتلاش</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"چاشقىنەك بەلگىسى ئەكران گىرۋىكىگە يەتىپ بارغاندا خىزمەت مۇھىتلىرىنى قاتلا(_P)"
+msgid "Hide content of windows when _resizing"
+msgstr "كۆزنەكنىڭ چوڭلۇقىنى ئۆزگەرتىۋاتقاندا مەزمۇنى كۆرۈنمىسۇن(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "فوكۇسلانغۇچە بولغان ۋاقىت(_D)"
+msgid "Hide content of windows when _moving"
+msgstr "كۆزنەكنى يۆتكەۋاتقاندا مەزمۇنى كۆرۈنمىسۇن(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "گىرۋەك قارىشلىقى(_E):"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>يۆتكەش ۋە چوڭلۇقىنى ئۆزگەرتىش</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "فوكۇس(_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "ماۋزۇ تاياقچىسى قوش چېكىلگەندە مەزكۇر ھەرىكەت ئېلىپ بېرىلىدۇ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "كۆڭۈلدىكىگە قايتۇر(_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>قوش چېكىلگەندىكى ھەرىكەت</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "ئۇسلۇب(_S)"
+msgid "Ad_vanced"
+msgstr "ئالىي(_V)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -664,222 +664,232 @@ msgstr ""
 "بۇ بارلىق تېزلەتمىلەرنىڭ كۆڭۈلدىكى قىممەتلىرىنى ئەسلىگە كەلتۈرۈۋاتىدۇ. بۇنى "
 "قىلسۇنمۇ؟"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>چوڭ</i>"
-
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>تۇتۇق</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"\"skip pager\" ياكى \"skip taskbar\" خاسلىقى بەكىتىلگەن\n"
+"كوزنەكتىن ئاتلاپ كەت."
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "يوشۇرۇن(سىڭەلگىلەشتۇرۇلگەن) كوزنەكنى ئوز ئىچىگە ئال(_I)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>سۈزۈك</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
+msgid "_Draw frame around selected windows while cycling"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "ئېكراننىڭ مەركىزىدە(_C)"
+msgid "C_ycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
+msgid "Activate _focus stealing prevention"
 msgstr ""
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
+msgid "Honor _standard ICCCM focus hint"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr ""
+msgid "When a window raises itself:"
+msgstr "كۆزنەك ئۆزىنى كۆتۈرگەندە:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr ""
+msgid "_Bring window on current workspace"
+msgstr "كۆزنەكنى ھازىرقى  خىزمەت مۇھىتىغا ئېلىپ كەل(_B)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr ""
+msgid "Switch to win_dow's workspace"
+msgstr "كۆزنەكنىڭ خىزمەت مۇھىتىنى ئالماشتۇرۇش(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "ھېچنېمە قىلما(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "ئەڭ چوڭ قىلىنغاندا كۆزنەكنىڭ گىرۋىكىنى يوشۇر(_F)"
+msgid "Key used to _grab and move windows:"
+msgstr "كۆزنەكنى تۇتۇش ۋە يۆتكەش كۇنۇپكىسى(_G):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr ""
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "چاشقىنەك كۇنۇپكىلىرى بېسىلغاندا كۆزنەك كۆتۈرۈلسۇن(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "جىددىي ئۇقتۇرۇش كۆزنىكىنىڭ توختاتماي لىپىلدات"
+msgid "Hide _frame of windows when maximized"
+msgstr "ئەڭ چوڭ قىلىنغاندا كۆزنەكنىڭ گىرۋىكىنى يوشۇر(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "كۆزنەكنى تۇتۇش ۋە يۆتكەش كۇنۇپكىسى(_G):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr ""
+"ئەڭ چوڭ ھالەتتىكى كۆزنەك يۆتكەلگەندە ئەسلىدىكى چوڭلۇقى ئەسلىگە كەلتۈرۈلسۇن"
+"(_S)"
 
+# FIXME: should be revised
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "جىددىي ئۇقتۇرۇش كۆزنىكىنىڭ گىرۋىكىنى لىپىلدات(_U)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "كوزنەك snapping نى ئىشلەتمەي كوزنەك قارىشلىقىنى ئىشلەت(_E)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "كۆزنەك گىرۋىكىنىڭ تۇتۇقلۇقى(_T):"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "جىددىي ئۇقتۇرۇش كۆزنىكىنىڭ گىرۋىكىنى لىپىلدات(_U)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "ئاكتىپ بولمىغان كۆزنەكنىڭ تۇتۇقلۇقى(_I):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "جىددىي ئۇقتۇرۇش كۆزنىكىنىڭ توختاتماي لىپىلدات"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
+# FIXME: i hate this transliteration
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "popup كۆزنەكنىڭ تۇتۇقلۇقى(_S):"
+msgid "_Accessibility"
+msgstr ""
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "يۆتكىلىۋاتقان كۆزنەكنىڭ تۇتۇقلۇقى(_M):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "workspace نى ئالماشتۇرۇش ئۈچۈن چاشقىنەك چاقىنى ئىشلەتسۇن(_M)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "چوڭلۇقى ئۆزگەرتىلىۋاتقان كۆزنەكنىڭ تۇتۇقلۇقى(_Z):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
 msgstr ""
-"ئەڭ چوڭ ھالەتتىكى كۆزنەك يۆتكەلگەندە ئەسلىدىكى چوڭلۇقى ئەسلىگە كەلتۈرۈلسۇن"
-"(_S)"
+"تېزلەتمە كۇنۇپكا ئارقىلىق ئالماشتۇرغاندا\n"
+"بۇرۇنقى كۆزنەكنى ئېسىدە ساقلىۋالسۇن(_R)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "dock كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_D)"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"ئەمەلىي ئۇستەليۇزى ئورۇنلاشتۇرۇلىشىغا ئاساسەن خىزمەت مۇھىتىنى قاتلا(_L)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "نورمال كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_R)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"بىرىنچى ياكى ئەڭ ئاخىرقى خىزمەت مۇھىتىغا بارغاندا خىزمەت مۇھىتىنى قاتلا(_F)"
 
-# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "popup كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_U)"
+msgid "_Workspaces"
+msgstr "خىزمەت مۇھىتى(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "كۆزنەكنىڭ خىزمەت مۇھىتىنى ئالماشتۇرۇش(_D)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "چاشقىنەك نۇر بەلگىسىنىڭ ئاستى(_P)"
-
-# FIXME: should be revised
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "كوزنەك snapping نى ئىشلەتمەي كوزنەك قارىشلىقىنى ئىشلەت(_E)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "workspace نى ئالماشتۇرۇش ئۈچۈن چاشقىنەك چاقىنى ئىشلەتسۇن(_M)"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr ""
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "كۆزنەك ئۆزىنى كۆتۈرگەندە:"
+msgid "<i>Large</i>"
+msgstr "<i>چوڭ</i>"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
-"ئەمەلىي ئۇستەليۇزى ئورۇنلاشتۇرۇلىشىغا ئاساسەن خىزمەت مۇھىتىنى قاتلا(_L)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
+msgid "At the _center of the screen"
+msgstr "ئېكراننىڭ مەركىزىدە(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"بىرىنچى ياكى ئەڭ ئاخىرقى خىزمەت مۇھىتىغا بارغاندا خىزمەت مۇھىتىنى قاتلا(_F)"
+msgid "Under the mouse _pointer"
+msgstr "چاشقىنەك نۇر بەلگىسىنىڭ ئاستى(_P)"
 
-# FIXME: i hate this transliteration
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr ""
+msgid "_Placement"
+msgstr "ئورۇنلاشتۇرۇش(_P)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "كۆزنەكنى ھازىرقى  خىزمەت مۇھىتىغا ئېلىپ كەل(_B)"
+msgid "_Enable display compositing"
+msgstr ""
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
+msgid "Display _fullscreen overlay windows directly"
 msgstr ""
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr ""
+msgid "Show shadows under _regular windows"
+msgstr "نورمال كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_R)"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "popup كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_U)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "يوشۇرۇن(سىڭەلگىلەشتۇرۇلگەن) كوزنەكنى ئوز ئىچىگە ئال(_I)"
+msgid "Show shadows under _dock windows"
+msgstr "dock كوزنەكنىڭ ئاستىدىكى سايىنى كورسەت(_D)"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+msgid "Opaci_ty of window decorations:"
+msgstr "كۆزنەك گىرۋىكىنىڭ تۇتۇقلۇقى(_T):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "ئورۇنلاشتۇرۇش(_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>سۈزۈك</i>"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "چاشقىنەك كۇنۇپكىلىرى بېسىلغاندا كۆزنەك كۆتۈرۈلسۇن(_R)"
+msgid "<i>Opaque</i>"
+msgstr "<i>تۇتۇق</i>"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"تېزلەتمە كۇنۇپكا ئارقىلىق ئالماشتۇرغاندا\n"
-"بۇرۇنقى كۆزنەكنى ئېسىدە ساقلىۋالسۇن(_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "ئاكتىپ بولمىغان كۆزنەكنىڭ تۇتۇقلۇقى(_I):"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "يۆتكىلىۋاتقان كۆزنەكنىڭ تۇتۇقلۇقى(_M):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"\"skip pager\" ياكى \"skip taskbar\" خاسلىقى بەكىتىلگەن\n"
-"كوزنەكتىن ئاتلاپ كەت."
+msgid "Opacity of windows during resi_ze:"
+msgstr "چوڭلۇقى ئۆزگەرتىلىۋاتقان كۆزنەكنىڭ تۇتۇقلۇقى(_Z):"
+
+# FIXME: compositor won't work on irix, thus it's blind-translation
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "popup كۆزنەكنىڭ تۇتۇقلۇقى(_S):"
 
+# FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "خىزمەت مۇھىتى(_W)"
+msgid "C_ompositor"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>بوشلۇق</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "خىزمەت مۇھىتى سانى(_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>خىزمەت مۇھىتى</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "ئاتى(_N):"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "خىزمەت مۇھىتى سانى(_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>بوشلۇق</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -887,36 +897,36 @@ msgstr "خىزمەت مۇھىتى سانى(_N):"
 msgid "%s (on %s)"
 msgstr "%s ( %s نىڭدا)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "نەشر ئۇچۇرى"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1050,12 +1060,15 @@ msgstr "بالا process تىن سانلىق-ئاساسلارنى ئوقۇشتا
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "helper-dialog نى پەيدا قىلالمىدى: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "خىزمەت مۇھىتىنىڭ ئاتى ۋە سانىنى بەلگىلەش"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>خىزمەت مۇھىتى</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "خىزمەت مۇھىتىنىڭ ئاتىنى ئۆزگەرت"
 
-#~ msgid "_Name:"
-#~ msgstr "ئاتى(_N):"
-
 # FIXME:
 #~ msgid "Hide"
 #~ msgstr "يوشۇر"
diff --git a/po/uk.po b/po/uk.po
index 2e82cae..900c00a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,22 +1,23 @@
 # Ukrainian translation of xfwm4
 # Copyright (C) 2002-2006 The Xfce development team
 # This file is distributed under the same license as the xfwm4 package.
-# 
+#
 # Maxim Dziumanenko <dziumanenko at gmail.com>, 2003-2006.
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-24 21:06+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-02-24 20:24+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce-i18n at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -84,238 +85,238 @@ msgid "Settings manager socket"
 msgstr "Сокет Менеджера властивостей"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "Налаштувати заголовок вікна і ярлик запуску"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Менеджер вікон"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "Тонке налаштування заголовку вікна і ефектів"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Налаштувати заголовок вікна і ярлик запуску"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Налаштування менеджера вікон"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "Визначити кількість і назви робочих областей"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Тонке налаштування заголовку вікна і ефектів"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Робочі області"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>Переміщення та зміни розміру блоку</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>Кнопка розкладки</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>_Дія при подвійному клацанні</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_Тема</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>Модель фокусу</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>_Шрифт заголовку</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>Фокус для нового вікна</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>_Вирівнювання заголовку</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>Підняти при клацанні</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Клацніть та перетягніть кнопки, щоб змінити їх розкладку"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>Підняти при отримані фокусу</b>"
+msgid "Title"
+msgstr "Заголовок"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>_Вирівнювання заголовку</b>"
+msgid "The window title cannot be removed"
+msgstr "Неможливо видалити заголовок вікна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>_Шрифт заголовку</b>"
+msgid "Active"
+msgstr "Активне вікно"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>_Комбінації клавіш вікна</b>"
+msgid "Menu"
+msgstr "Меню"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>Прилипання вікон</b>"
+msgid "Stick"
+msgstr "Приліпити"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>Перемикання робочих областей</b>"
+msgid "Shade"
+msgstr "Згорнути у заголовок"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_Тема</b>"
+msgid "Minimize"
+msgstr "Мінімізувати"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Розгорнути"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>Тривала</i>"
+msgid "Close"
+msgstr "Закрити"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Приховування"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>Коротка</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>Кнопка розкладки</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_Стиль"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>Маленький</i>"
+msgid "_Reset to Defaults"
+msgstr "Відновити ти_пові"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>_Комбінації клавіш вікна</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>Широка</i>"
+msgid "Ke_yboard"
+msgstr "К_лавіатура"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Активне вікно"
+msgid "Clic_k to focus"
+msgstr "Отримати фокус при к_лацанні"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "Д_одатково"
+msgid "Focus follows _mouse"
+msgstr "Отримати фокус при наведенні _мишки"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Автоматично піднімати вікна при одержанні фо_кусу"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "Автоматичне одержання фокусу новос_твореними вікнами"
+msgid "_Delay before window receives focus:"
+msgstr "Затримка перед одержанням фокусу _вікна:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "Отримати фокус при к_лацанні"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "Клацніть та перетягніть кнопки, щоб змінити їх розкладку"
+msgid "<i>Short</i>"
+msgstr "<i>Коротка</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Закрити"
+msgid "<i>Long</i>"
+msgstr "<i>Тривала</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>Модель фокусу</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "Затр_имка перед підніманням вікна з фокусом:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Автоматичне одержання фокусу новос_твореними вікнами"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "Від_стань:"
+msgid "<b>New window focus</b>"
+msgstr "<b>Фокус для нового вікна</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "Отримати фокус при наведенні _мишки"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Автоматично піднімати вікна при одержанні фо_кусу"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Приховування"
+msgid "Delay _before raising focused window:"
+msgstr "Затр_имка перед підніманням вікна з фокусом:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "Ховати вміст вікон при пере_міщенні"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>Підняти при отримані фокусу</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "Приховати вміст вікон при зміні _розміру"
+msgid "Raise window when clicking _inside application window"
+msgstr "Піднімати вікно при клацанні _всередині вікна програми"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "К_лавіатура"
+msgid "<b>Raise on click</b>"
+msgstr "<b>Підняти при клацанні</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Розгорнути"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "Фокус вікн_а"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Меню"
+msgid "Snap windows to screen _border"
+msgstr "Пр_илипання вікна до меж екрана"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "Мінімізувати"
+msgid "Snap windows to other _windows"
+msgstr "Прилипання вікна до _інших вікон"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "Піднімати вікно при клацанні _всередині вікна програми"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Згорнути у заголовок"
+msgid "Dis_tance:"
+msgstr "Від_стань:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "Прилипання вікна до _інших вікон"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "Пр_илипання вікна до меж екрана"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>Маленький</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Приліпити"
+msgid "<i>Wide</i>"
+msgstr "<i>Широка</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Дія, що виконується при подвійному клацанні на заголовку вікна"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>Прилипання вікон</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "Неможливо видалити заголовок вікна"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Переходити на іншу робочу область при _залишені курсором меж екрану"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Заголовок"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
 "Переходити на іншу робочу область при перетягу_ванні вікна за межі екрану"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "Відс_тань від краю:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>Перемикання робочих областей</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Переходити на іншу робочу область при _залишені курсором меж екрану"
+msgid "Hide content of windows when _resizing"
+msgstr "Приховати вміст вікон при зміні _розміру"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "Затримка перед одержанням фокусу _вікна:"
+msgid "Hide content of windows when _moving"
+msgstr "Ховати вміст вікон при пере_міщенні"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "Відс_тань від краю:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>Переміщення та зміни розміру блоку</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "Фокус вікн_а"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Дія, що виконується при подвійному клацанні на заголовку вікна"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "Відновити ти_пові"
+msgid "<b>Double click _action</b>"
+msgstr "<b>_Дія при подвійному клацанні</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_Стиль"
+msgid "Ad_vanced"
+msgstr "Д_одатково"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -653,208 +654,218 @@ msgstr ""
 "Це зробить відновлення всіх комбінацій клавіш до їх типових значень. Ви "
 "дійсно хочете зробити це?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>Великий</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>Непрозорі</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Пропускати в_ікна, що мають ознаку\n"
+"\"skip pager\" або \"skip taskbar\""
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Вклю_чаючи приховані (згорнуті в значки) вінка"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>Прозорі</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "П_еремикатися між вікнами на усіх робочих областях"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "_Активувати запобігання викраденню фокусу вікна"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "_Відображати рамки навколо вибраних вікон під час перемикання"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "По _центру екрану"
+msgid "C_ycling"
+msgstr "Перемика_ння вікон"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "Типово розміщати вікна:"
+msgid "Activate _focus stealing prevention"
+msgstr "_Активувати запобігання викраденню фокусу вікна"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "_Укладач"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Враховувати стандартн_і підказки фокусу ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "Перемика_ння вікон"
+msgid "When a window raises itself:"
+msgstr "Коли вікно піднімається:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "П_еремикатися між вікнами на усіх робочих областях"
+msgid "_Bring window on current workspace"
+msgstr "Поміст_ити вікно на поточну робочу область"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Н_апряму відображати повністю розгорнуті вікна, що перекриваються"
+msgid "Switch to win_dow's workspace"
+msgstr "Перемкнути _вікна робочої області"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "Нічого не роби_ти"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "Ховати р_амку розгорнутих вікон"
+msgid "Key used to _grab and move windows:"
+msgstr "Клавіша, що використовується для захо_плення та переміщення вікон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Враховувати стандартн_і підказки фокусу ICCCM"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Піднімати ві_кна при натисканні будь-якої кнопки миші"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "Зберігати важливі вікна постійно бл_имаючими"
+msgid "Hide _frame of windows when maximized"
+msgstr "Ховати р_амку розгорнутих вікон"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "Клавіша, що використовується для захо_плення та переміщення вікон:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Відновлювати початковий розм_ір розгорнутого вікна при переміщенні"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "Повідомляти _важливість вікон через блимання їх оформлення"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Використов_увати опір меж вікна замість прилипання вікон"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "Н_епрозорість оформлення вікон:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "Повідомляти _важливість вікон через блимання їх оформлення"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "Непрозорість _неактивних вікон:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "Зберігати важливі вікна постійно бл_имаючими"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "Непрозорість спливаючих в_ікон:"
+msgid "_Accessibility"
+msgstr "_Доступність"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "Непрозорість вікон при пере_міщенні:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "Колесо мишки над стіл_ьницею для перемикання робочих областей"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "Непрозорість вікон при зміні ро_зміру:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Відновлювати початковий розм_ір розгорнутого вікна при переміщенні"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"Запам'ятати та повертатись до робочої\n"
+"області при переми_канні комбінацією клавіш"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "Відображати тіні під ш_вартованими вікнами"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr ""
+"Перехо_дити на іншу робочу область в залежності від поточного розташування "
+"стільниці"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "Відображати тіні під звичайними ві_кнами"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Переходити на іншу робочу область при досягненні першої чи ост_анньої "
+"робочої області"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "Відображати тіні під сп_ливаючими вікнами"
+msgid "_Workspaces"
+msgstr "_Робочі області"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "Перемкнути _вікна робочої області"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "Під вка_зівником мишки"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Використов_увати опір меж вікна замість прилипання вікон"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "Колесо мишки над стіл_ьницею для перемикання робочих областей"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr ""
+"_Мінімальний розмір вікон, при якому буде увімкнено розумне розташування:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "Коли вікно піднімається:"
+msgid "<i>Large</i>"
+msgstr "<i>Великий</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "Типово розміщати вікна:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr ""
-"Перехо_дити на іншу робочу область в залежності від поточного розташування "
-"стільниці"
+msgid "At the _center of the screen"
+msgstr "По _центру екрану"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Переходити на іншу робочу область при досягненні першої чи ост_анньої "
-"робочої області"
+msgid "Under the mouse _pointer"
+msgstr "Під вка_зівником мишки"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_Доступність"
+msgid "_Placement"
+msgstr "_Розташування"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "Поміст_ити вікно на поточну робочу область"
+msgid "_Enable display compositing"
+msgstr "Увімкну_ти ефекти дисплею"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "_Відображати рамки навколо вибраних вікон під час перемикання"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Н_апряму відображати повністю розгорнуті вікна, що перекриваються"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "Увімкну_ти ефекти дисплею"
+msgid "Show shadows under _regular windows"
+msgstr "Відображати тіні під звичайними ві_кнами"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "Відображати тіні під сп_ливаючими вікнами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Вклю_чаючи приховані (згорнуті в значки) вінка"
+msgid "Show shadows under _dock windows"
+msgstr "Відображати тіні під ш_вартованими вікнами"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
-"_Мінімальний розмір вікон, при якому буде увімкнено розумне розташування:"
+msgid "Opaci_ty of window decorations:"
+msgstr "Н_епрозорість оформлення вікон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_Розташування"
+msgid "<i>Transparent</i>"
+msgstr "<i>Прозорі</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Піднімати ві_кна при натисканні будь-якої кнопки миші"
+msgid "<i>Opaque</i>"
+msgstr "<i>Непрозорі</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"Запам'ятати та повертатись до робочої\n"
-"області при переми_канні комбінацією клавіш"
+msgid "Opacity of _inactive windows:"
+msgstr "Непрозорість _неактивних вікон:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "Непрозорість вікон при пере_міщенні:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Пропускати в_ікна, що мають ознаку\n"
-"\"skip pager\" або \"skip taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Непрозорість вікон при зміні ро_зміру:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "Непрозорість спливаючих в_ікон:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_Робочі області"
+msgid "C_ompositor"
+msgstr "_Укладач"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>Поля</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "_Кількість робочих областей:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>Робочі області</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_Назва:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Поля - це області на краях екрану, у яких не розташовуватимуться вікна"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "_Кількість робочих областей:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>Поля</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -862,35 +873,35 @@ msgstr "_Кількість робочих областей:"
 msgid "%s (on %s)"
 msgstr "%s (на %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "Перевести у фоновий режим"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "Перевести у фоновий режим (не підтримується)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "Призначити композитний режим"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "Призначити композитний режим (не підтримується)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "Замінти існуючий менеджер вікон"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "Показати інформацію про версію і вийти"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[АРГУМЕНТИ...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "Введіть \"%s --help\" для допомоги по використанню."
@@ -1022,12 +1033,15 @@ msgstr "Помилка читання даних з підпроцесу   : %s\
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "Неможливо створити діалог : %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Визначити кількість і назви робочих областей"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>Робочі області</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "Вибрати назви робочих областей"
 
-#~ msgid "_Name:"
-#~ msgstr "_Назва:"
-
 #~ msgid "Hide"
 #~ msgstr "Приховати"
 
diff --git a/po/ur.po b/po/ur.po
index 4f8b187..4ec6f2c 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-05-14 02:34+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: urdu <makki.ma at gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Urdu\n"
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -86,242 +86,242 @@ msgid "Settings manager socket"
 msgstr "ترتیبات منیجر ساکٹ"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "ونڈو کا سلوک اور شارٹ کٹ وضع کریں"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "ونڈو منیجر"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "ونڈو کا سلوک اور ایفیکٹ مرتب کریں"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "ونڈو کا سلوک اور شارٹ کٹ وضع کریں"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "ونڈو منیجر کار کردگی"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "مقام کاروں کی تعداد اور نام متعین کریں"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "ونڈو کا سلوک اور ایفیکٹ مرتب کریں"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "مقام کار"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>بکس منتقلی اور ری سائز</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>بٹن کا خاکہ</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>ڈبل کلک ح_رکت</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_تھیم</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>فوکس ماڈل</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>عنوان کا _فونٹ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>نئی ونڈو فوکس</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>عنوان کی _ہمواری</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>کلک پر اونچا کریں</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "خاکہ تبدیل کرنے کے لیے بٹن پر کلک کرکے گھسیٹیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>فوکس پر اونچا کریں</b>"
+msgid "Title"
+msgstr "عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>عنوان کی _ہمواری</b>"
+msgid "The window title cannot be removed"
+msgstr "ونڈو کا عنوان حذف نہیں کیا جاسکتا"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>عنوان کا _فونٹ</b>"
+msgid "Active"
+msgstr "فعال"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>ونڈو _شارٹ کٹ</b>"
+msgid "Menu"
+msgstr "مینیو"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>ونڈوز سنیپنگ</b>"
+msgid "Stick"
+msgstr "چسپاں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>مقام کار سمیٹنا</b>"
+msgid "Shade"
+msgstr "شیڈ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_تھیم</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "_چھوٹا کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "بڑا کریں"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "تاخیر|<i>طویل</i>"
+msgid "Close"
+msgstr "بند کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "خفیہ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
-msgid "<i>Short</i>"
-msgstr "تاخیر|<i>مختصر</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>بٹن کا خاکہ</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_انداز"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-#, fuzzy
-msgid "<i>Small</i>"
-msgstr "حجم|<i>چھوٹا</i>"
+msgid "_Reset to Defaults"
+msgstr "طے شدہ پر _بحال کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>ونڈو _شارٹ کٹ</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
-msgid "<i>Wide</i>"
-msgstr "فاصلہ|<i>چوڑا</i>"
+msgid "Ke_yboard"
+msgstr "_کیبورڈ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "فعال"
+msgid "Clic_k to focus"
+msgstr "فوکس کے لیے _کلک کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "ا_علی"
+msgid "Focus follows _mouse"
+msgstr "فوکس _ماؤس کے پیچھے"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "جب ونڈوز کو فوکس وصول ہو انہیں خودکار اونچا کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "نئی بننے والی ونڈوز کو خودکار فوکس دیں"
+msgid "_Delay before window receives focus:"
+msgstr "ونڈو کا فوکس لینے سے پہلے _وقفہ:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "فوکس کے لیے _کلک کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "خاکہ تبدیل کرنے کے لیے بٹن پر کلک کرکے گھسیٹیں"
+#, fuzzy
+msgid "<i>Short</i>"
+msgstr "تاخیر|<i>مختصر</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "بند کریں"
+#, fuzzy
+msgid "<i>Long</i>"
+msgstr "تاخیر|<i>طویل</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>فوکس ماڈل</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "فوکس شدہ ونڈو کی اونچائی سے _پہلے وقفہ:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "نئی بننے والی ونڈوز کو خودکار فوکس دیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "فا_صلہ:"
+msgid "<b>New window focus</b>"
+msgstr "<b>نئی ونڈو فوکس</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "فوکس _ماؤس کے پیچھے"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "جب ونڈوز کو فوکس وصول ہو انہیں خودکار اونچا کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "خفیہ"
+msgid "Delay _before raising focused window:"
+msgstr "فوکس شدہ ونڈو کی اونچائی سے _پہلے وقفہ:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "ونڈوز کی منتقلی پر اس کا مواد پوشیدہ کریں"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>فوکس پر اونچا کریں</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "ونڈوز کی _ریزنگ پر اس کا مواد چھپائیں"
+msgid "Raise window when clicking _inside application window"
+msgstr "اطلاقیہ ونڈو کے اندر کلک کرنے پر ونڈو اونچی کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_کیبورڈ"
+msgid "<b>Raise on click</b>"
+msgstr "<b>کلک پر اونچا کریں</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "بڑا کریں"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_فوکس"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "مینیو"
+msgid "Snap windows to screen _border"
+msgstr "ونڈوز سکرین _بارڈر کی طرف سنیپ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "_چھوٹا کریں"
+msgid "Snap windows to other _windows"
+msgstr "ونڈوز دیگر ونڈوز کی طرف سنیپ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "اطلاقیہ ونڈو کے اندر کلک کرنے پر ونڈو اونچی کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "شیڈ"
+msgid "Dis_tance:"
+msgstr "فا_صلہ:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "ونڈوز دیگر ونڈوز کی طرف سنیپ کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "ونڈوز سکرین _بارڈر کی طرف سنیپ کریں"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#, fuzzy
+msgid "<i>Small</i>"
+msgstr "حجم|<i>چھوٹا</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "چسپاں"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "فاصلہ|<i>چوڑا</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "عنوان پٹی پر دہرا کلک کرنے پر ادا ہونے والی حرکت"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>ونڈوز سنیپنگ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "ونڈو کا عنوان حذف نہیں کیا جاسکتا"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "جب پ_ؤائنٹر سکرین کے کناروں تک پہنچے مقام کار کو سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "عنوان"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "سکرین کی ونڈو گھسیٹنے _پر مقام کار سمیٹیں"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "ک_ناروں کی مدافعت:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>مقام کار سمیٹنا</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "جب پ_ؤائنٹر سکرین کے کناروں تک پہنچے مقام کار کو سمیٹیں"
+msgid "Hide content of windows when _resizing"
+msgstr "ونڈوز کی _ریزنگ پر اس کا مواد چھپائیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "ونڈو کا فوکس لینے سے پہلے _وقفہ:"
+msgid "Hide content of windows when _moving"
+msgstr "ونڈوز کی منتقلی پر اس کا مواد پوشیدہ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "ک_ناروں کی مدافعت:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>بکس منتقلی اور ری سائز</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_فوکس"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "عنوان پٹی پر دہرا کلک کرنے پر ادا ہونے والی حرکت"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "طے شدہ پر _بحال کریں"
+msgid "<b>Double click _action</b>"
+msgstr "<b>ڈبل کلک ح_رکت</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_انداز"
+msgid "Ad_vanced"
+msgstr "ا_علی"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -665,205 +665,215 @@ msgstr ""
 "یہ شارٹ کٹس کو ان کی طے شدہ قدروں پر بحال کردے گا. کیا آپ واقعی ایسا کرنا "
 "چاہتے ہیں؟"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
-msgid "<i>Large</i>"
-msgstr "حجم|<i>بڑا</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>معتم</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"وہ ونڈوز ن_ظر انداز کریں جو \"skip pager\"\n"
+"یا \"skip taskbar\" خصوصیات سیٹ رکھتی ہیں"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_بشمول خفیہ (مثلاً iconified) ونڈوز"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>شفاف</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "تمام مقام کاروں پر ونڈوز کے درمیان چکر"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "_فوکس چوری ممانعت فعال کریں"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "منتخب کردہ ونڈوز کی سائکلنگ کے دوران اس کے گرد فری_م بنائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "سکرین کے _وسط میں"
+msgid "C_ycling"
+msgstr "سائکلن_گ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "طے شدہ طور پر، ونڈوز رکھیں:"
+msgid "Activate _focus stealing prevention"
+msgstr "_فوکس چوری ممانعت فعال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "کمپ_وزیٹر"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "اعزام معیاری ICCCM فوکس ہنٹ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "سائکلن_گ"
+msgid "When a window raises itself:"
+msgstr "جب ونڈو خود کو raises کرے:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "تمام مقام کاروں پر ونڈوز کے درمیان چکر"
+msgid "_Bring window on current workspace"
+msgstr "ونڈو حالیہ ڈیسک ٹاپ پر _لائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "براہ راست فل سکرین اوورلے ونڈو ظاہر کریں"
+msgid "Switch to win_dow's workspace"
+msgstr "ونڈو_ز مقام کار پر منتقل ہوں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "کچ_ھ نہ کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "بڑا کرنے پر ونڈوز کے _فریم چھپائیں"
+msgid "Key used to _grab and move windows:"
+msgstr "ونڈوز کو پک_ڑنے اور منتقل کرنے کا بٹن:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "اعزام معیاری ICCCM فوکس ہنٹ"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "جب ماؤس کا کوئی بھی بٹن دبایا جائے ونڈوز _ریز کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "ارجنٹ ونڈو کی تکراری بلنکنگ باقی رکھیں"
+msgid "Hide _frame of windows when maximized"
+msgstr "بڑا کرنے پر ونڈوز کے _فریم چھپائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "ونڈوز کو پک_ڑنے اور منتقل کرنے کا بٹن:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "ونڈوز منتقل کرتے وقت ان کا اصل _حجم برقرار رکھیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "ونڈوز کی ڈیکوریشن چمکا کر اضطراری حالت سے متنبہ کریں"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ونڈو سنیپنگ کی بجائے _کنارہ مدافعت استعمال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "ونڈوز ڈیکوریشن کی ک_ثافت:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "ونڈوز کی ڈیکوریشن چمکا کر اضطراری حالت سے متنبہ کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "_غیر فعال ونڈوز کی کثافت:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "ارجنٹ ونڈو کی تکراری بلنکنگ باقی رکھیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "پوپ اپ ون_ڈوز کی کثافت:"
+msgid "_Accessibility"
+msgstr "_قابلیتِ رسائی"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "_منتقل کرتے وقت ونڈوز کی کثافت:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"مقام کاروں کے درمیان منتقلی کے لیے ڈیسک ٹاپ پر _ماؤس کا پہیہ استعمال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "حجم تب_دیل کرتے وقت ونڈوز کی کثافت:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "ونڈوز منتقل کرتے وقت ان کا اصل _حجم برقرار رکھیں"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"سابقہ مقام کار _یاد رکھیں اور اسے پھر بلائیں\n"
+"جب کیبورڈ شارٹ کٹ سے منتقلی انجام دی جائے"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "_ڈوک ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "اصل ڈیسک ٹاپ _خاکہ کے مطابق مقام کار سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "_سادہ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "جب _پہلا یا آخری مقام کار تمام ہو مقام کار سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "پ_وپ اپ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "_Workspaces"
+msgstr "_مقام کار"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "ونڈو_ز مقام کار پر منتقل ہوں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "ماؤس _پؤائنٹر کے ذیل میں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ونڈو سنیپنگ کی بجائے _کنارہ مدافعت استعمال کریں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"مقام کاروں کے درمیان منتقلی کے لیے ڈیسک ٹاپ پر _ماؤس کا پہیہ استعمال کریں"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "ونڈوز کا کم سے کم حجم:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "جب ونڈو خود کو raises کرے:"
+#, fuzzy
+msgid "<i>Large</i>"
+msgstr "حجم|<i>بڑا</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "طے شدہ طور پر، ونڈوز رکھیں:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "اصل ڈیسک ٹاپ _خاکہ کے مطابق مقام کار سمیٹیں"
+msgid "At the _center of the screen"
+msgstr "سکرین کے _وسط میں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "جب _پہلا یا آخری مقام کار تمام ہو مقام کار سمیٹیں"
+msgid "Under the mouse _pointer"
+msgstr "ماؤس _پؤائنٹر کے ذیل میں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_قابلیتِ رسائی"
+msgid "_Placement"
+msgstr "_پلیسمنٹ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "ونڈو حالیہ ڈیسک ٹاپ پر _لائیں"
+msgid "_Enable display compositing"
+msgstr "_ڈسپلے کمپوزیٹنگ فعال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "منتخب کردہ ونڈوز کی سائکلنگ کے دوران اس کے گرد فری_م بنائیں"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "براہ راست فل سکرین اوورلے ونڈو ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_ڈسپلے کمپوزیٹنگ فعال کریں"
+msgid "Show shadows under _regular windows"
+msgstr "_سادہ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "پ_وپ اپ ونڈوز کے ذیل میں سایہ ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_بشمول خفیہ (مثلاً iconified) ونڈوز"
+msgid "Show shadows under _dock windows"
+msgstr "_ڈوک ونڈوز کے ذیل میں سایہ ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "ونڈوز کا کم سے کم حجم:"
+msgid "Opaci_ty of window decorations:"
+msgstr "ونڈوز ڈیکوریشن کی ک_ثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_پلیسمنٹ"
+msgid "<i>Transparent</i>"
+msgstr "<i>شفاف</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "جب ماؤس کا کوئی بھی بٹن دبایا جائے ونڈوز _ریز کریں"
+msgid "<i>Opaque</i>"
+msgstr "<i>معتم</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"سابقہ مقام کار _یاد رکھیں اور اسے پھر بلائیں\n"
-"جب کیبورڈ شارٹ کٹ سے منتقلی انجام دی جائے"
+msgid "Opacity of _inactive windows:"
+msgstr "_غیر فعال ونڈوز کی کثافت:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "_منتقل کرتے وقت ونڈوز کی کثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"وہ ونڈوز ن_ظر انداز کریں جو \"skip pager\"\n"
-"یا \"skip taskbar\" خصوصیات سیٹ رکھتی ہیں"
+msgid "Opacity of windows during resi_ze:"
+msgstr "حجم تب_دیل کرتے وقت ونڈوز کی کثافت:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "پوپ اپ ون_ڈوز کی کثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_مقام کار"
+msgid "C_ompositor"
+msgstr "کمپ_وزیٹر"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>مارجن</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "مقام کاروں کی _تعداد:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>مقام کار</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_نام:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "مارجن سکرین کے کناروں کا علاقہ ہے جہاں کوئی ونڈو نہیں رکھی جاسکتی"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "مقام کاروں کی _تعداد:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>مارجن</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -871,36 +881,36 @@ msgstr "مقام کاروں کی _تعداد:"
 msgid "%s (on %s)"
 msgstr "%s (پر %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "ورژن معلومات"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1032,12 +1042,15 @@ msgstr "چائلڈ عمل کاری سے مواد پڑھنے میں غلطی: %s\
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "امدادی ڈائیلاگ سپاؤن نہیں کیا جاسکتا: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "مقام کاروں کی تعداد اور نام متعین کریں"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>مقام کار</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "مقام کار کا نام تبدیل کریں"
 
-#~ msgid "_Name:"
-#~ msgstr "_نام:"
-
 #~ msgid "Hide"
 #~ msgstr "چھپائیں"
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 4f8b187..4ec6f2c 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2009-05-14 02:34+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: urdu <makki.ma at gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Urdu\n"
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -86,242 +86,242 @@ msgid "Settings manager socket"
 msgstr "ترتیبات منیجر ساکٹ"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "ونڈو کا سلوک اور شارٹ کٹ وضع کریں"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "ونڈو منیجر"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "ونڈو کا سلوک اور ایفیکٹ مرتب کریں"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "ونڈو کا سلوک اور شارٹ کٹ وضع کریں"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "ونڈو منیجر کار کردگی"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "مقام کاروں کی تعداد اور نام متعین کریں"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "ونڈو کا سلوک اور ایفیکٹ مرتب کریں"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "مقام کار"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>بکس منتقلی اور ری سائز</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>بٹن کا خاکہ</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>ڈبل کلک ح_رکت</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>_تھیم</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>فوکس ماڈل</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>عنوان کا _فونٹ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>نئی ونڈو فوکس</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>عنوان کی _ہمواری</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>کلک پر اونچا کریں</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "خاکہ تبدیل کرنے کے لیے بٹن پر کلک کرکے گھسیٹیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>فوکس پر اونچا کریں</b>"
+msgid "Title"
+msgstr "عنوان"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>عنوان کی _ہمواری</b>"
+msgid "The window title cannot be removed"
+msgstr "ونڈو کا عنوان حذف نہیں کیا جاسکتا"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>عنوان کا _فونٹ</b>"
+msgid "Active"
+msgstr "فعال"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>ونڈو _شارٹ کٹ</b>"
+msgid "Menu"
+msgstr "مینیو"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>ونڈوز سنیپنگ</b>"
+msgid "Stick"
+msgstr "چسپاں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>مقام کار سمیٹنا</b>"
+msgid "Shade"
+msgstr "شیڈ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>_تھیم</b>"
+#, fuzzy
+msgid "Minimize"
+msgstr "_چھوٹا کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "بڑا کریں"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "تاخیر|<i>طویل</i>"
+msgid "Close"
+msgstr "بند کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "خفیہ"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
-msgid "<i>Short</i>"
-msgstr "تاخیر|<i>مختصر</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>بٹن کا خاکہ</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "_انداز"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-#, fuzzy
-msgid "<i>Small</i>"
-msgstr "حجم|<i>چھوٹا</i>"
+msgid "_Reset to Defaults"
+msgstr "طے شدہ پر _بحال کریں"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>ونڈو _شارٹ کٹ</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
-msgid "<i>Wide</i>"
-msgstr "فاصلہ|<i>چوڑا</i>"
+msgid "Ke_yboard"
+msgstr "_کیبورڈ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "فعال"
+msgid "Clic_k to focus"
+msgstr "فوکس کے لیے _کلک کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "ا_علی"
+msgid "Focus follows _mouse"
+msgstr "فوکس _ماؤس کے پیچھے"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "جب ونڈوز کو فوکس وصول ہو انہیں خودکار اونچا کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "نئی بننے والی ونڈوز کو خودکار فوکس دیں"
+msgid "_Delay before window receives focus:"
+msgstr "ونڈو کا فوکس لینے سے پہلے _وقفہ:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "فوکس کے لیے _کلک کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "خاکہ تبدیل کرنے کے لیے بٹن پر کلک کرکے گھسیٹیں"
+#, fuzzy
+msgid "<i>Short</i>"
+msgstr "تاخیر|<i>مختصر</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "بند کریں"
+#, fuzzy
+msgid "<i>Long</i>"
+msgstr "تاخیر|<i>طویل</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>فوکس ماڈل</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "فوکس شدہ ونڈو کی اونچائی سے _پہلے وقفہ:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "نئی بننے والی ونڈوز کو خودکار فوکس دیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "فا_صلہ:"
+msgid "<b>New window focus</b>"
+msgstr "<b>نئی ونڈو فوکس</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "فوکس _ماؤس کے پیچھے"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "جب ونڈوز کو فوکس وصول ہو انہیں خودکار اونچا کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "خفیہ"
+msgid "Delay _before raising focused window:"
+msgstr "فوکس شدہ ونڈو کی اونچائی سے _پہلے وقفہ:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "ونڈوز کی منتقلی پر اس کا مواد پوشیدہ کریں"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>فوکس پر اونچا کریں</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "ونڈوز کی _ریزنگ پر اس کا مواد چھپائیں"
+msgid "Raise window when clicking _inside application window"
+msgstr "اطلاقیہ ونڈو کے اندر کلک کرنے پر ونڈو اونچی کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "_کیبورڈ"
+msgid "<b>Raise on click</b>"
+msgstr "<b>کلک پر اونچا کریں</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "بڑا کریں"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "_فوکس"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "مینیو"
+msgid "Snap windows to screen _border"
+msgstr "ونڈوز سکرین _بارڈر کی طرف سنیپ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-#, fuzzy
-msgid "Minimize"
-msgstr "_چھوٹا کریں"
+msgid "Snap windows to other _windows"
+msgstr "ونڈوز دیگر ونڈوز کی طرف سنیپ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "اطلاقیہ ونڈو کے اندر کلک کرنے پر ونڈو اونچی کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "شیڈ"
+msgid "Dis_tance:"
+msgstr "فا_صلہ:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "ونڈوز دیگر ونڈوز کی طرف سنیپ کریں"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "ونڈوز سکرین _بارڈر کی طرف سنیپ کریں"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#, fuzzy
+msgid "<i>Small</i>"
+msgstr "حجم|<i>چھوٹا</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "چسپاں"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "فاصلہ|<i>چوڑا</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "عنوان پٹی پر دہرا کلک کرنے پر ادا ہونے والی حرکت"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>ونڈوز سنیپنگ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "ونڈو کا عنوان حذف نہیں کیا جاسکتا"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "جب پ_ؤائنٹر سکرین کے کناروں تک پہنچے مقام کار کو سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "عنوان"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "سکرین کی ونڈو گھسیٹنے _پر مقام کار سمیٹیں"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "ک_ناروں کی مدافعت:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>مقام کار سمیٹنا</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "جب پ_ؤائنٹر سکرین کے کناروں تک پہنچے مقام کار کو سمیٹیں"
+msgid "Hide content of windows when _resizing"
+msgstr "ونڈوز کی _ریزنگ پر اس کا مواد چھپائیں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "ونڈو کا فوکس لینے سے پہلے _وقفہ:"
+msgid "Hide content of windows when _moving"
+msgstr "ونڈوز کی منتقلی پر اس کا مواد پوشیدہ کریں"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "ک_ناروں کی مدافعت:"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>بکس منتقلی اور ری سائز</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "_فوکس"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "عنوان پٹی پر دہرا کلک کرنے پر ادا ہونے والی حرکت"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "طے شدہ پر _بحال کریں"
+msgid "<b>Double click _action</b>"
+msgstr "<b>ڈبل کلک ح_رکت</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "_انداز"
+msgid "Ad_vanced"
+msgstr "ا_علی"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -665,205 +665,215 @@ msgstr ""
 "یہ شارٹ کٹس کو ان کی طے شدہ قدروں پر بحال کردے گا. کیا آپ واقعی ایسا کرنا "
 "چاہتے ہیں؟"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
-msgid "<i>Large</i>"
-msgstr "حجم|<i>بڑا</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>معتم</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"وہ ونڈوز ن_ظر انداز کریں جو \"skip pager\"\n"
+"یا \"skip taskbar\" خصوصیات سیٹ رکھتی ہیں"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "_بشمول خفیہ (مثلاً iconified) ونڈوز"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>شفاف</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "تمام مقام کاروں پر ونڈوز کے درمیان چکر"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "_فوکس چوری ممانعت فعال کریں"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "منتخب کردہ ونڈوز کی سائکلنگ کے دوران اس کے گرد فری_م بنائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "سکرین کے _وسط میں"
+msgid "C_ycling"
+msgstr "سائکلن_گ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "طے شدہ طور پر، ونڈوز رکھیں:"
+msgid "Activate _focus stealing prevention"
+msgstr "_فوکس چوری ممانعت فعال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "کمپ_وزیٹر"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "اعزام معیاری ICCCM فوکس ہنٹ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "سائکلن_گ"
+msgid "When a window raises itself:"
+msgstr "جب ونڈو خود کو raises کرے:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "تمام مقام کاروں پر ونڈوز کے درمیان چکر"
+msgid "_Bring window on current workspace"
+msgstr "ونڈو حالیہ ڈیسک ٹاپ پر _لائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "براہ راست فل سکرین اوورلے ونڈو ظاہر کریں"
+msgid "Switch to win_dow's workspace"
+msgstr "ونڈو_ز مقام کار پر منتقل ہوں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "کچ_ھ نہ کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "بڑا کرنے پر ونڈوز کے _فریم چھپائیں"
+msgid "Key used to _grab and move windows:"
+msgstr "ونڈوز کو پک_ڑنے اور منتقل کرنے کا بٹن:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "اعزام معیاری ICCCM فوکس ہنٹ"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "جب ماؤس کا کوئی بھی بٹن دبایا جائے ونڈوز _ریز کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "ارجنٹ ونڈو کی تکراری بلنکنگ باقی رکھیں"
+msgid "Hide _frame of windows when maximized"
+msgstr "بڑا کرنے پر ونڈوز کے _فریم چھپائیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "ونڈوز کو پک_ڑنے اور منتقل کرنے کا بٹن:"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "ونڈوز منتقل کرتے وقت ان کا اصل _حجم برقرار رکھیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "ونڈوز کی ڈیکوریشن چمکا کر اضطراری حالت سے متنبہ کریں"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "ونڈو سنیپنگ کی بجائے _کنارہ مدافعت استعمال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "ونڈوز ڈیکوریشن کی ک_ثافت:"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "ونڈوز کی ڈیکوریشن چمکا کر اضطراری حالت سے متنبہ کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "_غیر فعال ونڈوز کی کثافت:"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "ارجنٹ ونڈو کی تکراری بلنکنگ باقی رکھیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "پوپ اپ ون_ڈوز کی کثافت:"
+msgid "_Accessibility"
+msgstr "_قابلیتِ رسائی"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "_منتقل کرتے وقت ونڈوز کی کثافت:"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
+"مقام کاروں کے درمیان منتقلی کے لیے ڈیسک ٹاپ پر _ماؤس کا پہیہ استعمال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "حجم تب_دیل کرتے وقت ونڈوز کی کثافت:"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "ونڈوز منتقل کرتے وقت ان کا اصل _حجم برقرار رکھیں"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"سابقہ مقام کار _یاد رکھیں اور اسے پھر بلائیں\n"
+"جب کیبورڈ شارٹ کٹ سے منتقلی انجام دی جائے"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "_ڈوک ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "اصل ڈیسک ٹاپ _خاکہ کے مطابق مقام کار سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "_سادہ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "جب _پہلا یا آخری مقام کار تمام ہو مقام کار سمیٹیں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "پ_وپ اپ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+msgid "_Workspaces"
+msgstr "_مقام کار"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "ونڈو_ز مقام کار پر منتقل ہوں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "ماؤس _پؤائنٹر کے ذیل میں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "ونڈو سنیپنگ کی بجائے _کنارہ مدافعت استعمال کریں"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
-"مقام کاروں کے درمیان منتقلی کے لیے ڈیسک ٹاپ پر _ماؤس کا پہیہ استعمال کریں"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "ونڈوز کا کم سے کم حجم:"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "جب ونڈو خود کو raises کرے:"
+#, fuzzy
+msgid "<i>Large</i>"
+msgstr "حجم|<i>بڑا</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "طے شدہ طور پر، ونڈوز رکھیں:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "اصل ڈیسک ٹاپ _خاکہ کے مطابق مقام کار سمیٹیں"
+msgid "At the _center of the screen"
+msgstr "سکرین کے _وسط میں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "جب _پہلا یا آخری مقام کار تمام ہو مقام کار سمیٹیں"
+msgid "Under the mouse _pointer"
+msgstr "ماؤس _پؤائنٹر کے ذیل میں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "_قابلیتِ رسائی"
+msgid "_Placement"
+msgstr "_پلیسمنٹ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "ونڈو حالیہ ڈیسک ٹاپ پر _لائیں"
+msgid "_Enable display compositing"
+msgstr "_ڈسپلے کمپوزیٹنگ فعال کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "منتخب کردہ ونڈوز کی سائکلنگ کے دوران اس کے گرد فری_م بنائیں"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "براہ راست فل سکرین اوورلے ونڈو ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "_ڈسپلے کمپوزیٹنگ فعال کریں"
+msgid "Show shadows under _regular windows"
+msgstr "_سادہ ونڈوز کے ذیل میں سایہ ظاہر کریں"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "پ_وپ اپ ونڈوز کے ذیل میں سایہ ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "_بشمول خفیہ (مثلاً iconified) ونڈوز"
+msgid "Show shadows under _dock windows"
+msgstr "_ڈوک ونڈوز کے ذیل میں سایہ ظاہر کریں"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "ونڈوز کا کم سے کم حجم:"
+msgid "Opaci_ty of window decorations:"
+msgstr "ونڈوز ڈیکوریشن کی ک_ثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "_پلیسمنٹ"
+msgid "<i>Transparent</i>"
+msgstr "<i>شفاف</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "جب ماؤس کا کوئی بھی بٹن دبایا جائے ونڈوز _ریز کریں"
+msgid "<i>Opaque</i>"
+msgstr "<i>معتم</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"سابقہ مقام کار _یاد رکھیں اور اسے پھر بلائیں\n"
-"جب کیبورڈ شارٹ کٹ سے منتقلی انجام دی جائے"
+msgid "Opacity of _inactive windows:"
+msgstr "_غیر فعال ونڈوز کی کثافت:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "_منتقل کرتے وقت ونڈوز کی کثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"وہ ونڈوز ن_ظر انداز کریں جو \"skip pager\"\n"
-"یا \"skip taskbar\" خصوصیات سیٹ رکھتی ہیں"
+msgid "Opacity of windows during resi_ze:"
+msgstr "حجم تب_دیل کرتے وقت ونڈوز کی کثافت:"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "پوپ اپ ون_ڈوز کی کثافت:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "_مقام کار"
+msgid "C_ompositor"
+msgstr "کمپ_وزیٹر"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>مارجن</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "مقام کاروں کی _تعداد:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>مقام کار</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "_نام:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "مارجن سکرین کے کناروں کا علاقہ ہے جہاں کوئی ونڈو نہیں رکھی جاسکتی"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "مقام کاروں کی _تعداد:"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>مارجن</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -871,36 +881,36 @@ msgstr "مقام کاروں کی _تعداد:"
 msgid "%s (on %s)"
 msgstr "%s (پر %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr ""
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 #, fuzzy
 msgid "Print version information and exit"
 msgstr "ورژن معلومات"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1032,12 +1042,15 @@ msgstr "چائلڈ عمل کاری سے مواد پڑھنے میں غلطی: %s\
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "امدادی ڈائیلاگ سپاؤن نہیں کیا جاسکتا: %s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "مقام کاروں کی تعداد اور نام متعین کریں"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>مقام کار</b>"
+
 #~ msgid "Change workspace name"
 #~ msgstr "مقام کار کا نام تبدیل کریں"
 
-#~ msgid "_Name:"
-#~ msgstr "_نام:"
-
 #~ msgid "Hide"
 #~ msgstr "چھپائیں"
 
diff --git a/po/vi.po b/po/vi.po
index e5af1bb..9eed80d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2006-09-05 03:09+0400\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi82 at gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=1; nplural=0\n"
 
@@ -82,280 +82,279 @@ msgid "Settings manager socket"
 msgstr ""
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-#, fuzzy
-msgid "Configure window behavior and shortcuts"
-msgstr "Độ mờ của trang trí cửa sổ"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "Trình quản lí cửa sổ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
 #, fuzzy
-msgid "Fine-tune window behaviour and effects"
+msgid "Configure window behavior and shortcuts"
 msgstr "Độ mờ của trang trí cửa sổ"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "Tinh chỉnh của trình quản lí cửa sổ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
 #, fuzzy
-msgid "Set number and names of workspaces"
-msgstr "Số vùng làm việc:"
+msgid "Fine-tune window behaviour and effects"
+msgstr "Độ mờ của trang trí cửa sổ"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "Vùng làm việc"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Box move and resize</b>"
-msgstr "Mờ khi di chuyển và thay đổi kích thước"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
-msgid "<b>Button layout</b>"
-msgstr "Bố cục nút"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Double click _action</b>"
-msgstr "Hành động khi nhấp đúp chuột"
+msgid "<b>_Theme</b>"
+msgstr "Canh tiêu đề"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 #, fuzzy
-msgid "<b>Focus model</b>"
-msgstr "Kiểu chọn cửa sổ"
+msgid "<b>Title fon_t</b>"
+msgstr "Phông tiêu đề"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 #, fuzzy
-msgid "<b>New window focus</b>"
-msgstr "Chọn cửa sổ mới mở"
+msgid "<b>Title _alignment</b>"
+msgstr "Canh tiêu đề"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
 #, fuzzy
-msgid "<b>Raise on click</b>"
-msgstr "Nâng khi nhấp chuột"
+msgid "Click and drag the buttons to change the layout"
+msgstr "Nhấp chuột và kéo các nút để thay đổi bố cục"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Raise on focus</b>"
-msgstr "Nâng khi chọn"
+msgid "Title"
+msgstr "Tiêu đề"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
 #, fuzzy
-msgid "<b>Title _alignment</b>"
-msgstr "Canh tiêu đề"
+msgid "The window title cannot be removed"
+msgstr "Tiêu đề cửa sổ, không thể bỏ đi"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Title fon_t</b>"
-msgstr "Phông tiêu đề"
+msgid "Active"
+msgstr "Hoạt động"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Window _shortcuts</b>"
-msgstr "Phím tắt cửa sổ"
+msgid "Menu"
+msgstr "Thực đơn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Windows snapping</b>"
-msgstr "Điều chỉnh bờ cửa sổ"
+msgid "Stick"
+msgstr "Dính"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Wrap workspaces</b>"
-msgstr "Chuyển vùng làm việc"
+msgid "Shade"
+msgstr "Che"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
 #, fuzzy
-msgid "<b>_Theme</b>"
-msgstr "Canh tiêu đề"
+msgid "Minimize"
+msgstr "_Phóng to"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "Phóng to"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
-msgid "<i>Long</i>"
-msgstr "Lớn"
+msgid "Close"
+msgstr "Đóng"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "Ẩn"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 #, fuzzy
-msgid "<i>Short</i>"
-msgstr "Trong suốt"
+msgid "<b>Button layout</b>"
+msgstr "Bố cục nút"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+#, fuzzy
+msgid "_Style"
+msgstr "Phong cách"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Reset to Defaults"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
 #, fuzzy
-msgid "<i>Small</i>"
-msgstr "Nhỏ"
+msgid "<b>Window _shortcuts</b>"
+msgstr "Phím tắt cửa sổ"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
 #, fuzzy
-msgid "<i>Wide</i>"
-msgstr "Rộng"
+msgid "Ke_yboard"
+msgstr "Bàn phím"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "Hoạt động"
+#, fuzzy
+msgid "Clic_k to focus"
+msgstr "Nhấp chuột để chọn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 #, fuzzy
-msgid "Ad_vanced"
-msgstr "Cao cấp"
+msgid "Focus follows _mouse"
+msgstr "Chọn theo vị trí chuột"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 #, fuzzy
-msgid "Automatically _raise windows when they receive focus"
-msgstr "Tự động nâng cửa sổ khi chúng được chọn"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
-msgid "Automatically give focus to _newly created windows"
-msgstr "Tự động chọn cửa sổ mới được tạo"
+msgid "_Delay before window receives focus:"
+msgstr "Thời gian trễn trước khi nâng cửa sổ được chọn:"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
 #, fuzzy
-msgid "Clic_k to focus"
-msgstr "Nhấp chuột để chọn"
+msgid "<i>Short</i>"
+msgstr "Trong suốt"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
+#. Raise focus delay
+#: ../settings-dialogs/xfwm4-dialog.glade.h:28
 #, fuzzy
-msgid "Click and drag the buttons to change the layout"
-msgstr "Nhấp chuột và kéo các nút để thay đổi bố cục"
+msgid "<i>Long</i>"
+msgstr "Lớn"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "Đóng"
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+#, fuzzy
+msgid "<b>Focus model</b>"
+msgstr "Kiểu chọn cửa sổ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
 #, fuzzy
-msgid "Delay _before raising focused window:"
-msgstr "Thời gian trễn trước khi nâng cửa sổ được chọn:"
+msgid "Automatically give focus to _newly created windows"
+msgstr "Tự động chọn cửa sổ mới được tạo"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 #, fuzzy
-msgid "Dis_tance:"
-msgstr "Khoảng cách:"
+msgid "<b>New window focus</b>"
+msgstr "Chọn cửa sổ mới mở"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 #, fuzzy
-msgid "Focus follows _mouse"
-msgstr "Chọn theo vị trí chuột"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "Tự động nâng cửa sổ khi chúng được chọn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "Ẩn"
+#, fuzzy
+msgid "Delay _before raising focused window:"
+msgstr "Thời gian trễn trước khi nâng cửa sổ được chọn:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 #, fuzzy
-msgid "Hide content of windows when _moving"
-msgstr "Hiển thị nội dung cửa sổ khi di chuyển"
+msgid "<b>Raise on focus</b>"
+msgstr "Nâng khi chọn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
 #, fuzzy
-msgid "Hide content of windows when _resizing"
-msgstr "Hiển thị nội dung cửa sổ khi thay đổi kích thước"
+msgid "Raise window when clicking _inside application window"
+msgstr "Nâng cửa sổ khi nhấp chuột bên trong cửa sổ ứng dụng"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 #, fuzzy
-msgid "Ke_yboard"
-msgstr "Bàn phím"
+msgid "<b>Raise on click</b>"
+msgstr "Nâng khi nhấp chuột"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "Phóng to"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+#, fuzzy
+msgid "_Focus"
+msgstr "Chọn"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "Thực đơn"
+#, fuzzy
+msgid "Snap windows to screen _border"
+msgstr "Bờ cửa sổ theo bờ màn hình"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 #, fuzzy
-msgid "Minimize"
-msgstr "_Phóng to"
+msgid "Snap windows to other _windows"
+msgstr "Bờ cửa sổ theo các cửa sổ khác"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 #, fuzzy
-msgid "Raise window when clicking _inside application window"
-msgstr "Nâng cửa sổ khi nhấp chuột bên trong cửa sổ ứng dụng"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "Che"
+msgid "Dis_tance:"
+msgstr "Khoảng cách:"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
 #, fuzzy
-msgid "Snap windows to other _windows"
-msgstr "Bờ cửa sổ theo các cửa sổ khác"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
-msgid "Snap windows to screen _border"
-msgstr "Bờ cửa sổ theo bờ màn hình"
+msgid "<i>Small</i>"
+msgstr "Nhỏ"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "Dính"
+#, fuzzy
+msgid "<i>Wide</i>"
+msgstr "Rộng"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 #, fuzzy
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Hành động khi nhấp đúp trên thanh tiêu đề:"
+msgid "<b>Windows snapping</b>"
+msgstr "Điều chỉnh bờ cửa sổ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 #, fuzzy
-msgid "The window title cannot be removed"
-msgstr "Tiêu đề cửa sổ, không thể bỏ đi"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "Chuyển vùng làm việc khi con trỏ đến bờ màn hình"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "Tiêu đề"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 #, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "Chuyển vùng làm việc khi kéo cửa sổ ra khỏi màn hình"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#, fuzzy
+msgid "_Edge resistance:"
+msgstr "Sức đề kháng bờ:"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+#, fuzzy
+msgid "<b>Wrap workspaces</b>"
+msgstr "Chuyển vùng làm việc"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 #, fuzzy
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "Chuyển vùng làm việc khi con trỏ đến bờ màn hình"
+msgid "Hide content of windows when _resizing"
+msgstr "Hiển thị nội dung cửa sổ khi thay đổi kích thước"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 #, fuzzy
-msgid "_Delay before window receives focus:"
-msgstr "Thời gian trễn trước khi nâng cửa sổ được chọn:"
+msgid "Hide content of windows when _moving"
+msgstr "Hiển thị nội dung cửa sổ khi di chuyển"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 #, fuzzy
-msgid "_Edge resistance:"
-msgstr "Sức đề kháng bờ:"
+msgid "<b>Box move and resize</b>"
+msgstr "Mờ khi di chuyển và thay đổi kích thước"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 #, fuzzy
-msgid "_Focus"
-msgstr "Chọn"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "Hành động khi nhấp đúp trên thanh tiêu đề:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr ""
+#, fuzzy
+msgid "<b>Double click _action</b>"
+msgstr "Hành động khi nhấp đúp chuột"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 #, fuzzy
-msgid "_Style"
-msgstr "Phong cách"
+msgid "Ad_vanced"
+msgstr "Cao cấp"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -733,54 +732,56 @@ msgid ""
 "do this?"
 msgstr ""
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
 #, fuzzy
-msgid "<i>Large</i>"
-msgstr "Lớn"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"Bỏ qua những cửa sổ có đặt thuộc tính \"skip pager\" hoặc \"skip taskbar\""
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 #, fuzzy
-msgid "<i>Opaque</i>"
-msgstr "Mờ đục"
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "Gồm cả những tập tin ẩn (ví dụ thu nhỏ)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 #, fuzzy
-msgid "<i>Transparent</i>"
-msgstr "Trong suốt"
+msgid "Cycle _through windows on all workspaces"
+msgstr "Quay vòng cửa sổ của tất cả các vùng làm"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
-msgid "Activate _focus stealing prevention"
-msgstr "Kích hoạt sự bảo vệ chọn khỏi mất cắp"
+msgid "_Draw frame around selected windows while cycling"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr ""
+#, fuzzy
+msgid "C_ycling"
+msgstr "Chu kỳ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr ""
+#, fuzzy
+msgid "Activate _focus stealing prevention"
+msgstr "Kích hoạt sự bảo vệ chọn khỏi mất cắp"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
 #, fuzzy
-msgid "C_ompositor"
-msgstr "Trình soạn"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "Gợi ý chọn theo chuẩn ICCCM vinh dự"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
-msgid "C_ycling"
-msgstr "Chu kỳ"
+msgid "When a window raises itself:"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
 #, fuzzy
-msgid "Cycle _through windows on all workspaces"
-msgstr "Quay vòng cửa sổ của tất cả các vùng làm"
+msgid "_Bring window on current workspace"
+msgstr "Di chuyển cửa sổ sang vùng làm việc kế"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
 #, fuzzy
-msgid "Display _fullscreen overlay windows directly"
-msgstr "Hiển thị thẳng các cửa sổ che đầy màn hình"
+msgid "Switch to win_dow's workspace"
+msgstr "Di chuyển cửa sổ sang vùng làm việc %d"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 #, fuzzy
@@ -788,183 +789,189 @@ msgid "Do _nothing"
 msgstr "Không"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr ""
+#, fuzzy
+msgid "Key used to _grab and move windows:"
+msgstr "Phím dùng để giữ và di chuyển cửa sổ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 #, fuzzy
-msgid "Honor _standard ICCCM focus hint"
-msgstr "Gợi ý chọn theo chuẩn ICCCM vinh dự"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "Chọn cửa sổ khi nhấn bất kỳ phím chuột nào"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
+msgid "Hide _frame of windows when maximized"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 #, fuzzy
-msgid "Key used to _grab and move windows:"
-msgstr "Phím dùng để giữ và di chuyển cửa sổ"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "Phục hồi kích thước ban đầu của cửa sổ đã phóng to khi di chuyển"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr ""
+#, fuzzy
+msgid "Use _edge resistance instead of window snapping"
+msgstr "Sử dụng sức chống của đường biên cửa sổ thay cho sự dính"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
-msgid "Opaci_ty of window decorations:"
-msgstr "Độ mờ của trang trí cửa sổ"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
-msgid "Opacity of _inactive windows:"
-msgstr "Độ mờ của cửa sổ không phải hiện thời"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 #, fuzzy
-msgid "Opacity of popup window_s:"
-msgstr "Độ mờ của cửa sổ tự hiện lên (popup)"
+msgid "_Accessibility"
+msgstr "Mở rộng"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
-msgid "Opacity of windows during _move:"
-msgstr "Độ mờ của cửa sổ khi di chuyển"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
-msgid "Opacity of windows during resi_ze:"
-msgstr "Độ mờ của cửa sổ khi thay đổi kích thước"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
-msgid "Restore original _size of maximized windows when moving"
-msgstr "Phục hồi kích thước ban đầu của cửa sổ đã phóng to khi di chuyển"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr "Nhớ và gọi lại cửa sổ trước đây khi chuyển bằng phím nóng"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 #, fuzzy
-msgid "Show shadows under _dock windows"
-msgstr "Hiện bóng ở dưới các cửa sổ bật ra"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "Chuyển vùng làm việc theo vẻ ngoài thực sự của màn hình"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 #, fuzzy
-msgid "Show shadows under _regular windows"
-msgstr "Hiện bóng ở dưới các cửa sổ thường"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr ""
+"Nhảy tiếp vùng làm việc khi đã đạt đến vùng làm việc cuối cùng hoặc đầu tiên"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 #, fuzzy
-msgid "Show shadows under pop_up windows"
-msgstr "Hiện bóng ở dưới các cửa sổ bật ra"
+msgid "_Workspaces"
+msgstr "Vùng làm việc"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 #, fuzzy
-msgid "Switch to win_dow's workspace"
-msgstr "Di chuyển cửa sổ sang vùng làm việc %d"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr ""
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "Kích thước nhỏ nhất của cửa sổ để đặt thông minh"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+#. Smart placement size
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 #, fuzzy
-msgid "Use _edge resistance instead of window snapping"
-msgstr "Sử dụng sức chống của đường biên cửa sổ thay cho sự dính"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr ""
+msgid "<i>Large</i>"
+msgstr "Lớn"
 
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
 msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-#, fuzzy
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Chuyển vùng làm việc theo vẻ ngoài thực sự của màn hình"
+msgid "At the _center of the screen"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
-msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgid "Under the mouse _pointer"
 msgstr ""
-"Nhảy tiếp vùng làm việc khi đã đạt đến vùng làm việc cuối cùng hoặc đầu tiên"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #, fuzzy
-msgid "_Accessibility"
-msgstr "Mở rộng"
+msgid "_Placement"
+msgstr "Sắp đặt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 #, fuzzy
-msgid "_Bring window on current workspace"
-msgstr "Di chuyển cửa sổ sang vùng làm việc kế"
+msgid "_Enable display compositing"
+msgstr "Dùng hiển thị kết hợp"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+#, fuzzy
+msgid "Display _fullscreen overlay windows directly"
+msgstr "Hiển thị thẳng các cửa sổ che đầy màn hình"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 #, fuzzy
-msgid "_Enable display compositing"
-msgstr "Dùng hiển thị kết hợp"
+msgid "Show shadows under _regular windows"
+msgstr "Hiện bóng ở dưới các cửa sổ thường"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+#, fuzzy
+msgid "Show shadows under pop_up windows"
+msgstr "Hiện bóng ở dưới các cửa sổ bật ra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
 #, fuzzy
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Gồm cả những tập tin ẩn (ví dụ thu nhỏ)"
+msgid "Show shadows under _dock windows"
+msgstr "Hiện bóng ở dưới các cửa sổ bật ra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
 #, fuzzy
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Kích thước nhỏ nhất của cửa sổ để đặt thông minh"
+msgid "Opaci_ty of window decorations:"
+msgstr "Độ mờ của trang trí cửa sổ"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
 #, fuzzy
-msgid "_Placement"
-msgstr "Sắp đặt"
+msgid "<i>Transparent</i>"
+msgstr "Trong suốt"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
 #, fuzzy
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "Chọn cửa sổ khi nhấn bất kỳ phím chuột nào"
+msgid "<i>Opaque</i>"
+msgstr "Mờ đục"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
 #, fuzzy
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr "Nhớ và gọi lại cửa sổ trước đây khi chuyển bằng phím nóng"
+msgid "Opacity of _inactive windows:"
+msgstr "Độ mờ của cửa sổ không phải hiện thời"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+#, fuzzy
+msgid "Opacity of windows during _move:"
+msgstr "Độ mờ của cửa sổ khi di chuyển"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #, fuzzy
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"Bỏ qua những cửa sổ có đặt thuộc tính \"skip pager\" hoặc \"skip taskbar\""
+msgid "Opacity of windows during resi_ze:"
+msgstr "Độ mờ của cửa sổ khi thay đổi kích thước"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+#, fuzzy
+msgid "Opacity of popup window_s:"
+msgstr "Độ mờ của cửa sổ tự hiện lên (popup)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
 #, fuzzy
-msgid "_Workspaces"
-msgstr "Vùng làm việc"
+msgid "C_ompositor"
+msgstr "Trình soạn"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 #, fuzzy
-msgid "<b>Margins</b>"
-msgstr "Biên"
+msgid "_Number of workspaces:"
+msgstr "Số vùng làm việc:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
 #, fuzzy
-msgid "<b>Workspaces</b>"
-msgstr "Chuyển vùng làm việc"
+msgid "Names"
+msgstr "Tên:"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Biên là khu vực bên ngoài màn hình không thể đặt cửa sổ ứng dụng"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 #, fuzzy
-msgid "_Number of workspaces:"
-msgstr "Số vùng làm việc:"
+msgid "_Margins"
+msgstr "Biên"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -972,36 +979,36 @@ msgstr "Số vùng làm việc:"
 msgid "%s (on %s)"
 msgstr "%s (trên %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr ""
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr ""
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr ""
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr ""
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 #, fuzzy
 msgid "Replace the existing window manager"
 msgstr "Thiết lập trình quản lí cửa sổ Xfce 4"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr ""
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr ""
@@ -1145,6 +1152,18 @@ msgid "Cannot spawn helper-dialog: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "Số vùng làm việc:"
+
+#, fuzzy
+#~ msgid "<b>Margins</b>"
+#~ msgstr "Biên"
+
+#, fuzzy
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "Chuyển vùng làm việc"
+
+#, fuzzy
 #~ msgid "Change workspace name"
 #~ msgstr "Tên vùng làm việc"
 
@@ -1352,10 +1371,6 @@ msgstr ""
 #~ msgid "Change name"
 #~ msgstr "Đổi tên"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Tên:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Nhấp chuột lên tên vùng làm việc để thay đổi"
 
@@ -1373,10 +1388,6 @@ msgstr ""
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Vùng làm việc và Biên"
 
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Biên"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "Thiết lập trình quản lí cửa sổ"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e3c0e4c..b8fb158 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-11 04:18+0000\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2010-11-27 21:12+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
@@ -88,237 +88,237 @@ msgid "Settings manager socket"
 msgstr "设置管理器套接字"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "配置窗口行为和快捷键"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "窗口管理器"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "微调窗口行为和效果"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "配置窗口行为和快捷键"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "窗口管理器调整"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "设置工作区数目和名称:"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "微调窗口行为和效果"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "工作区"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>窗口移动和调整大小</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>按钮布局</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>双击动作(_A)</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>主题(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>焦点模式</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>标题字体(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>聚焦新窗口</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>标题对齐(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>点击时提升</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "点击并拖动按钮来改变布局"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>聚焦时提升</b>"
+msgid "Title"
+msgstr "标题"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>标题对齐(_A)</b>"
+msgid "The window title cannot be removed"
+msgstr "未能移除窗口标题"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>标题字体(_T)</b>"
+msgid "Active"
+msgstr "激活"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>窗口快捷键(_S)</b>"
+msgid "Menu"
+msgstr "菜单"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>窗口吸附</b>"
+msgid "Stick"
+msgstr "粘滞"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>回绕工作区</b>"
+msgid "Shade"
+msgstr "折叠"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>主题(_T)</b>"
+msgid "Minimize"
+msgstr "最小化"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "最大化"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>长</i>"
+msgid "Close"
+msgstr "关闭"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "隐藏"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>短</i>"
+msgid "<b>Button layout</b>"
+msgstr "<b>按钮布局</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "样式(_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>小</i>"
+msgid "_Reset to Defaults"
+msgstr "重置为默认(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>窗口快捷键(_S)</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>宽</i>"
+msgid "Ke_yboard"
+msgstr "键盘(_Y)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "激活"
+msgid "Clic_k to focus"
+msgstr "点击聚焦(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "高级(_V)"
+msgid "Focus follows _mouse"
+msgstr "焦点跟随鼠标(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "当窗口接收焦点时自动提升它们(_R)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "自动聚焦新创建的窗口(_N)"
+msgid "_Delay before window receives focus:"
+msgstr "窗口接收焦点前的延时(_D):"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "点击聚焦(_K)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "点击并拖动按钮来改变布局"
+msgid "<i>Short</i>"
+msgstr "<i>短</i>"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "关闭"
+msgid "<i>Long</i>"
+msgstr "<i>长</i>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>焦点模式</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "提升已聚焦窗口前的延时(_B):"
+msgid "Automatically give focus to _newly created windows"
+msgstr "自动聚焦新创建的窗口(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "距离(_T):"
+msgid "<b>New window focus</b>"
+msgstr "<b>聚焦新窗口</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "焦点跟随鼠标(_M)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "当窗口接收焦点时自动提升它们(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "隐藏"
+msgid "Delay _before raising focused window:"
+msgstr "提升已聚焦窗口前的延时(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "移动时隐藏窗口内容(_M)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>聚焦时提升</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "调整大小时隐藏窗口内容(_R)"
+msgid "Raise window when clicking _inside application window"
+msgstr "在应用程序窗口内点击时提升窗口(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "键盘(_Y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>点击时提升</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "最大化"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "焦点(_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "菜单"
+msgid "Snap windows to screen _border"
+msgstr "将窗口吸附到屏幕边缘(_B)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "最小化"
+msgid "Snap windows to other _windows"
+msgstr "将窗口吸附到其它窗口(_W)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "在应用程序窗口内点击时提升窗口(_I)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "折叠"
+msgid "Dis_tance:"
+msgstr "距离(_T):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "将窗口吸附到其它窗口(_W)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "将窗口吸附到屏幕边缘(_B)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>小</i>"
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "粘滞"
+msgid "<i>Wide</i>"
+msgstr "<i>宽</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "双击标题栏时执行的动作"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>窗口吸附</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "未能移除窗口标题"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "光标碰到屏幕边缘时回绕工作区(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "标题"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "拖动窗口离开屏幕时回绕工作区(_D)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "边缘阻距(_E):"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>回绕工作区</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "光标碰到屏幕边缘时回绕工作区(_P)"
+msgid "Hide content of windows when _resizing"
+msgstr "调整大小时隐藏窗口内容(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "窗口接收焦点前的延时(_D):"
+msgid "Hide content of windows when _moving"
+msgstr "移动时隐藏窗口内容(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "边缘阻距(_E):"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>窗口移动和调整大小</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "焦点(_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "双击标题栏时执行的动作"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "重置为默认(_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>双击动作(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "样式(_S)"
+msgid "Ad_vanced"
+msgstr "高级(_V)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -654,203 +654,212 @@ msgid ""
 "do this?"
 msgstr "这会将所有快捷键重置为默认。您真的要这样做吗?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>大</i>"
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>不透明</i>"
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr ""
+"跳过有 “跳过页面” 或 “跳过工具栏”\n"
+"属性设置的窗口(_S)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "包含隐藏(如图标化)窗口(_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>透明</i>"
+msgid "Cycle _through windows on all workspaces"
+msgstr "在所有工作区的窗口间循环(_T)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "激活焦点防偷看(_F)"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "循环时在选中的窗口周围绘制窗口边框(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "在屏幕中央(_C)"
+msgid "C_ycling"
+msgstr "循环(_Y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "默认放置窗口至:"
+msgid "Activate _focus stealing prevention"
+msgstr "激活焦点防偷看(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "合成器(_O)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "遵照标准的 ICCCM 焦点提示(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "循环(_Y)"
+msgid "When a window raises itself:"
+msgstr "窗口提升自己时:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "在所有工作区的窗口间循环(_T)"
+msgid "_Bring window on current workspace"
+msgstr "窗口放在当前工作区(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "直接覆盖窗口显示全屏(_F)"
+msgid "Switch to win_dow's workspace"
+msgstr "切换至窗口的工作区(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "什么都不做(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "最大化时隐藏窗口边框(_F)"
+msgid "Key used to _grab and move windows:"
+msgstr "用来捕获和移动窗口的按键(_G):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "遵照标准的 ICCCM 焦点提示(_S)"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "按下任意鼠标按钮时提升窗口(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "紧急窗口保持闪烁(_B)"
+msgid "Hide _frame of windows when maximized"
+msgstr "最大化时隐藏窗口边框(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "用来捕获和移动窗口的按键(_G):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "移动时恢复已最大化窗口的原大小(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "窗口修饰闪烁以示紧急(_U)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "使用边缘阻距而不是窗口吸附(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "窗口装饰的不透明度(_T):"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "窗口修饰闪烁以示紧急(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "不活动窗口的不透明度(_I):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "紧急窗口保持闪烁(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "弹出窗口的不透明度(_S):"
+msgid "_Accessibility"
+msgstr "辅助功能(_A)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "移动窗口时的不透明度(_M):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "在桌面使用鼠标滚轮切换工作区(_M)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "调整窗口大小时的不透明度(_Z):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "移动时恢复已最大化窗口的原大小(_S)"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"由键盘快捷键切换时记住并恢复先前的\n"
+"工作区(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "在 dock 窗口下显示阴影(_D)"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "回绕工作区取决于实际的桌面布局(_L)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "在常规窗口下显示阴影(_R)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "到达第一个或最后一个工作区时回绕工作区(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "在弹出窗口下显示阴影(_U)"
+msgid "_Workspaces"
+msgstr "工作区(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "切换至窗口的工作区(_D)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "在鼠标光标下(_P)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "使用边缘阻距而不是窗口吸附(_E)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "在桌面使用鼠标滚轮切换工作区(_M)"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "触发智能放置的窗口最小大小(_M):"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "窗口提升自己时:"
+msgid "<i>Large</i>"
+msgstr "<i>大</i>"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "默认放置窗口至:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "回绕工作区取决于实际的桌面布局(_L)"
+msgid "At the _center of the screen"
+msgstr "在屏幕中央(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "到达第一个或最后一个工作区时回绕工作区(_F)"
+msgid "Under the mouse _pointer"
+msgstr "在鼠标光标下(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "辅助功能(_A)"
+msgid "_Placement"
+msgstr "放置(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "窗口放在当前工作区(_B)"
+msgid "_Enable display compositing"
+msgstr "启用显示合成(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "循环时在选中的窗口周围绘制窗口边框(_D)"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "直接覆盖窗口显示全屏(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "启用显示合成(_E)"
+msgid "Show shadows under _regular windows"
+msgstr "在常规窗口下显示阴影(_R)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "在弹出窗口下显示阴影(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "包含隐藏(如图标化)窗口(_I)"
+msgid "Show shadows under _dock windows"
+msgstr "在 dock 窗口下显示阴影(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "触发智能放置的窗口最小大小(_M):"
+msgid "Opaci_ty of window decorations:"
+msgstr "窗口装饰的不透明度(_T):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "放置(_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>透明</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "按下任意鼠标按钮时提升窗口(_R)"
+msgid "<i>Opaque</i>"
+msgstr "<i>不透明</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"由键盘快捷键切换时记住并恢复先前的\n"
-"工作区(_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "不活动窗口的不透明度(_I):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "移动窗口时的不透明度(_M):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr ""
-"跳过有 “跳过页面” 或 “跳过工具栏”\n"
-"属性设置的窗口(_S)"
+msgid "Opacity of windows during resi_ze:"
+msgstr "调整窗口大小时的不透明度(_Z):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "弹出窗口的不透明度(_S):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "工作区(_W)"
+msgid "C_ompositor"
+msgstr "合成器(_O)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>边缘</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "工作区编号(_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>工作区</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+msgid "Names"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "边缘是屏幕边上不能放置窗口的边界区域。"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "工作区编号(_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "<b>边缘</b>"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -858,35 +867,35 @@ msgstr "工作区编号(_N):"
 msgid "%s (on %s)"
 msgstr "%s (于 %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "转入后台"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "转入后台(不支持)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "设置合成模式"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "设置合成模式(不支持)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "替换已存在的窗口管理器"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "列印版本信息并退出"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[参数...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "输入 “%s --help” 获取用法。"
@@ -1017,3 +1026,9 @@ msgstr "从子进程读取数据时出错:%s\n"
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "未能启动帮助对话框:%s\n"
+
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "设置工作区数目和名称:"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>工作区</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ea9363c..23dbf24 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 23:10+0100\n"
+"POT-Creation-Date: 2012-04-07 19:58+0200\n"
 "PO-Revision-Date: 2011-11-13 10:15+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid ""
@@ -85,240 +85,240 @@ msgid "Settings manager socket"
 msgstr "設定值管理員 socket"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:29
-msgid "Configure window behavior and shortcuts"
-msgstr "調整視窗行為與捷徑"
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "Window Manager"
 msgstr "視窗管理程式"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-msgid "Fine-tune window behaviour and effects"
-msgstr "微調視窗視窗行為與效果"
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "調整視窗行為與捷徑"
 
-#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "Window Manager Tweaks"
 msgstr "視窗管理程式調校"
 
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid "Set number and names of workspaces"
-msgstr "設定工作區數目與名稱:"
+#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "微調視窗視窗行為與效果"
 
 #  Number of workspaces
-#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid "Workspaces"
 msgstr "工作區"
 
-#: ../settings-dialogs/xfwm4-dialog.glade.h:1
-msgid "<b>Box move and resize</b>"
-msgstr "<b>視窗移動與重新調整大小</b>"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:2
-msgid "<b>Button layout</b>"
-msgstr "<b>按鈕配置</b>"
+#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
+msgid "Configure layout, names and margins"
+msgstr ""
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-msgid "<b>Double click _action</b>"
-msgstr "<b>雙擊執行動作(_A)</b>"
+msgid "<b>_Theme</b>"
+msgstr "<b>主題(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-msgid "<b>Focus model</b>"
-msgstr "<b>焦點模型</b>"
+msgid "<b>Title fon_t</b>"
+msgstr "<b>標題字型(_T)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-msgid "<b>New window focus</b>"
-msgstr "<b>新視窗焦點</b>"
+msgid "<b>Title _alignment</b>"
+msgstr "<b>標題對齊方式(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-msgid "<b>Raise on click</b>"
-msgstr "<b>點選時抬升</b>"
+msgid "Click and drag the buttons to change the layout"
+msgstr "點擊並拖曳按鈕以變更其配置"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-msgid "<b>Raise on focus</b>"
-msgstr "<b>獲取焦點時抬升</b>"
+msgid "Title"
+msgstr "標題"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-msgid "<b>Title _alignment</b>"
-msgstr "<b>標題對齊方式(_A)</b>"
+msgid "The window title cannot be removed"
+msgstr "不能移除視窗標題"
 
+# FIXME 譯文有待改進
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-msgid "<b>Title fon_t</b>"
-msgstr "<b>標題字型(_T)</b>"
+msgid "Active"
+msgstr "現用"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-msgid "<b>Window _shortcuts</b>"
-msgstr "<b>視窗捷徑(_S)</b>"
+msgid "Menu"
+msgstr "選單"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-msgid "<b>Windows snapping</b>"
-msgstr "<b>視窗吸引</b>"
+msgid "Stick"
+msgstr "貼連"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-msgid "<b>Wrap workspaces</b>"
-msgstr "<b>迴繞工作區</b>"
+msgid "Shade"
+msgstr "捲起"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-msgid "<b>_Theme</b>"
-msgstr "<b>主題(_T)</b>"
+msgid "Minimize"
+msgstr "最小化"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:14
+msgid "Maximize"
+msgstr "最大化"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-msgid "<i>Long</i>"
-msgstr "<i>長</i> "
+msgid "Close"
+msgstr "關閉"
+
+# FIXME 譯文有待改進
+#: ../settings-dialogs/xfwm4-dialog.glade.h:16
+msgid "Hidden"
+msgstr "隱藏"
 
-#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-msgid "<i>Short</i>"
-msgstr "<i>短</i> "
+msgid "<b>Button layout</b>"
+msgstr "<b>按鈕配置</b>"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:18
+msgid "_Style"
+msgstr "風格(_S)"
 
-#. Edge resistance
-#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
-msgid "<i>Small</i>"
-msgstr "<i>小</i> "
+msgid "_Reset to Defaults"
+msgstr "重設為預設值(_R)"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:20
+msgid "<b>Window _shortcuts</b>"
+msgstr "<b>視窗捷徑(_S)</b>"
 
-#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-msgid "<i>Wide</i>"
-msgstr "<i>寬</i> "
+msgid "Ke_yboard"
+msgstr "鍵盤(_Y)"
 
-# FIXME 譯文有待改進
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-msgid "Active"
-msgstr "現用"
+msgid "Clic_k to focus"
+msgstr "點擊以獲取焦點(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-msgid "Ad_vanced"
-msgstr "進階(_V)"
+msgid "Focus follows _mouse"
+msgstr "焦點跟隨滑鼠(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-msgid "Automatically _raise windows when they receive focus"
-msgstr "當視窗獲取焦點時自動抬升該視窗(_R)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:25
-msgid "Automatically give focus to _newly created windows"
-msgstr "自動為新建立的視窗取得焦點(_N)"
+msgid "_Delay before window receives focus:"
+msgstr "視窗獲取焦點前的延遲時間(_D):"
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-msgid "Clic_k to focus"
-msgstr "點擊以獲取焦點(_K)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:27
-msgid "Click and drag the buttons to change the layout"
-msgstr "點擊並拖曳按鈕以變更其配置"
+msgid "<i>Short</i>"
+msgstr "<i>短</i> "
 
+#. Raise focus delay
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid "Close"
-msgstr "關閉"
+msgid "<i>Long</i>"
+msgstr "<i>長</i> "
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:29
+msgid "<b>Focus model</b>"
+msgstr "<b>焦點模型</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:30
-msgid "Delay _before raising focused window:"
-msgstr "抬升焦點所在視窗前的延遲時間(_B):"
+msgid "Automatically give focus to _newly created windows"
+msgstr "自動為新建立的視窗取得焦點(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-msgid "Dis_tance:"
-msgstr "距離(T):"
+msgid "<b>New window focus</b>"
+msgstr "<b>新視窗焦點</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-msgid "Focus follows _mouse"
-msgstr "焦點跟隨滑鼠(_M)"
+msgid "Automatically _raise windows when they receive focus"
+msgstr "當視窗獲取焦點時自動抬升該視窗(_R)"
 
-# FIXME 譯文有待改進
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-msgid "Hidden"
-msgstr "隱藏"
+msgid "Delay _before raising focused window:"
+msgstr "抬升焦點所在視窗前的延遲時間(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
-msgid "Hide content of windows when _moving"
-msgstr "當移動視窗時隱藏其內容(_M)"
+msgid "<b>Raise on focus</b>"
+msgstr "<b>獲取焦點時抬升</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:35
-msgid "Hide content of windows when _resizing"
-msgstr "當重新調整視窗大小時隱藏其內容(_R)"
+msgid "Raise window when clicking _inside application window"
+msgstr "當點擊應用程式視窗內部時抬升視窗(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-msgid "Ke_yboard"
-msgstr "鍵盤(_Y)"
+msgid "<b>Raise on click</b>"
+msgstr "<b>點選時抬升</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-msgid "Maximize"
-msgstr "最大化"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
+msgid "_Focus"
+msgstr "焦點(_F)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-msgid "Menu"
-msgstr "選單"
+msgid "Snap windows to screen _border"
+msgstr "在螢幕邊緣吸引視窗(_B)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
-msgid "Minimize"
-msgstr "最小化"
+msgid "Snap windows to other _windows"
+msgstr "讓視窗被其它視窗吸引(_W)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-msgid "Raise window when clicking _inside application window"
-msgstr "當點擊應用程式視窗內部時抬升視窗(_I)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:41
-msgid "Shade"
-msgstr "捲起"
+msgid "Dis_tance:"
+msgstr "距離(T):"
 
+#. Edge resistance
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
-msgid "Snap windows to other _windows"
-msgstr "讓視窗被其它視窗吸引(_W)"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:43
-msgid "Snap windows to screen _border"
-msgstr "在螢幕邊緣吸引視窗(_B)"
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
+msgid "<i>Small</i>"
+msgstr "<i>小</i> "
 
+#. Edge resistance
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
-msgid "Stick"
-msgstr "貼連"
+msgid "<i>Wide</i>"
+msgstr "<i>寬</i> "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
-msgid "The action to perform when the title-bar is double-clicked"
-msgstr "當雙擊標題列時要執行的動作"
+msgid "<b>Windows snapping</b>"
+msgstr "<b>視窗吸引</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
-msgid "The window title cannot be removed"
-msgstr "不能移除視窗標題"
+msgid "Wrap workspaces when the _pointer reaches the screen edge"
+msgstr "指標抵達螢幕邊緣時迴繞工作區(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-msgid "Title"
-msgstr "標題"
-
-#: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr "拖曳視窗離開螢幕時迴繞工作區(_D)"
 
+#: ../settings-dialogs/xfwm4-dialog.glade.h:48
+msgid "_Edge resistance:"
+msgstr "邊緣抗拒(_E):"
+
+#: ../settings-dialogs/xfwm4-dialog.glade.h:49
+msgid "<b>Wrap workspaces</b>"
+msgstr "<b>迴繞工作區</b>"
+
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "指標抵達螢幕邊緣時迴繞工作區(_P)"
+msgid "Hide content of windows when _resizing"
+msgstr "當重新調整視窗大小時隱藏其內容(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-msgid "_Delay before window receives focus:"
-msgstr "視窗獲取焦點前的延遲時間(_D):"
+msgid "Hide content of windows when _moving"
+msgstr "當移動視窗時隱藏其內容(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-msgid "_Edge resistance:"
-msgstr "邊緣抗拒(_E):"
+msgid "<b>Box move and resize</b>"
+msgstr "<b>視窗移動與重新調整大小</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-msgid "_Focus"
-msgstr "焦點(_F)"
+msgid "The action to perform when the title-bar is double-clicked"
+msgstr "當雙擊標題列時要執行的動作"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
-msgid "_Reset to Defaults"
-msgstr "重設為預設值(_R)"
+msgid "<b>Double click _action</b>"
+msgstr "<b>雙擊執行動作(_A)</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
-msgid "_Style"
-msgstr "風格(_S)"
+msgid "Ad_vanced"
+msgstr "進階(_V)"
 
 #: ../settings-dialogs/xfwm4-settings.c:220
 #: ../settings-dialogs/xfwm4-settings.c:253
@@ -665,202 +665,212 @@ msgid ""
 "do this?"
 msgstr "這會將所有捷徑重設為其預設值。您真的想要這麼做嗎?"
 
-#. Smart placement size
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-msgid "<i>Large</i>"
-msgstr "<i>大</i> "
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-msgid "<i>Opaque</i>"
-msgstr "<i>不透明</i> "
+msgid ""
+"_Skip windows that have \"skip pager\"\n"
+"or \"skip taskbar\" properties set"
+msgstr "跳過屬性有設定「skip pager」或「skip taskbar」的視窗(_S)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
+msgid "_Include hidden (i.e. iconified) windows"
+msgstr "包含隱藏 (如:圖示化的) 視窗(_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
-msgid "<i>Transparent</i>"
-msgstr "<i>透明</i> "
+msgid "Cycle _through windows on all workspaces"
+msgstr "在所有工作區的視窗間循環(_T)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-msgid "Activate _focus stealing prevention"
-msgstr "啟用預防竊取焦點功能(_F)"
+msgid "_Draw frame around selected windows while cycling"
+msgstr "當循環時繪製所選視窗周圍的框架(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-msgid "At the _center of the screen"
-msgstr "於螢幕中央(_C)"
+msgid "C_ycling"
+msgstr "循環(_Y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-msgid "By default, place windows:"
-msgstr "預設的視窗擺放位置:"
+msgid "Activate _focus stealing prevention"
+msgstr "啟用預防竊取焦點功能(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-msgid "C_ompositor"
-msgstr "合成器(_O)"
+msgid "Honor _standard ICCCM focus hint"
+msgstr "尊重標準 ICCCM 焦點提示(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-msgid "C_ycling"
-msgstr "循環(_Y)"
+msgid "When a window raises itself:"
+msgstr "當視窗抬升自己時:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-msgid "Cycle _through windows on all workspaces"
-msgstr "在所有工作區的視窗間循環(_T)"
+msgid "_Bring window on current workspace"
+msgstr "將視窗移至目前工作區(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-msgid "Display _fullscreen overlay windows directly"
-msgstr "以直接覆蓋視窗的方式顯示全螢幕(_F)"
+msgid "Switch to win_dow's workspace"
+msgstr "切換至視窗的工作區(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Do _nothing"
 msgstr "無動作(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid "Hide _frame of windows when maximized"
-msgstr "當最大化時隱藏視窗的框架(_F)"
+msgid "Key used to _grab and move windows:"
+msgstr "用來抓住並移動視窗的按鍵(_G):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-msgid "Honor _standard ICCCM focus hint"
-msgstr "尊重標準 ICCCM 焦點提示(_S)"
+msgid "_Raise windows when any mouse button is pressed"
+msgstr "按下任一滑鼠鍵時抬升視窗(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-msgid "Keep urgent windows _blinking repeatedly"
-msgstr "讓緊急視窗保持閃爍(_B)"
+msgid "Hide _frame of windows when maximized"
+msgstr "當最大化時隱藏視窗的框架(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-msgid "Key used to _grab and move windows:"
-msgstr "用來抓住並移動視窗的按鍵(_G):"
+msgid "Restore original _size of maximized windows when moving"
+msgstr "移動視窗時還原最大化視窗的原始大小(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-msgid "Notify of _urgency by making window's decoration blink"
-msgstr "藉由讓視窗裝飾閃爍來通知緊急事件(_U)"
+msgid "Use _edge resistance instead of window snapping"
+msgstr "使用邊緣抗拒取代視窗吸引(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-msgid "Opaci_ty of window decorations:"
-msgstr "視窗裝飾的不透明度(T):"
+msgid "Notify of _urgency by making window's decoration blink"
+msgstr "藉由讓視窗裝飾閃爍來通知緊急事件(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-msgid "Opacity of _inactive windows:"
-msgstr "非活動中視窗的不透明度(_I):"
+msgid "Keep urgent windows _blinking repeatedly"
+msgstr "讓緊急視窗保持閃爍(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-msgid "Opacity of popup window_s:"
-msgstr "彈出式視窗的不透明度(_S):"
+msgid "_Accessibility"
+msgstr "輔助功能(_A)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-msgid "Opacity of windows during _move:"
-msgstr "移動視窗時的不透明度(M):"
+msgid "Use the _mouse wheel on the desktop to switch workspaces"
+msgstr "在桌面上使用滑鼠滾輪以切換工作區(_M)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-msgid "Opacity of windows during resi_ze:"
-msgstr "調整視窗大小時的不透明度(_Z):"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-msgid "Restore original _size of maximized windows when moving"
-msgstr "移動視窗時還原最大化視窗的原始大小(_S)"
+msgid ""
+"_Remember and recall previous workspace\n"
+"when switching via keyboard shortcuts"
+msgstr ""
+"透過鍵盤捷徑切換時,記住並召回\n"
+"先前的工作區(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-msgid "Show shadows under _dock windows"
-msgstr "在 _dock 視窗下顯示陰影"
+msgid "Wrap workspaces depending on the actual desktop _layout"
+msgstr "以實際的桌面配置決定工作區迴繞(_L)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
-msgid "Show shadows under _regular windows"
-msgstr "在一般視窗下顯示陰影(_R)"
+msgid "Wrap workspaces when the _first or the last workspace is reached"
+msgstr "抵達第一個或最後一個工作區時時迴繞工作區(_F)"
 
+#  Number of workspaces
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-msgid "Show shadows under pop_up windows"
-msgstr "在彈出式視窗下顯示陰影(_U)"
+msgid "_Workspaces"
+msgstr "工作區(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
-msgid "Switch to win_dow's workspace"
-msgstr "切換至視窗的工作區(_D)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
-msgid "Under the mouse _pointer"
-msgstr "在滑鼠指標之下(_R)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-msgid "Use _edge resistance instead of window snapping"
-msgstr "使用邊緣抗拒取代視窗吸引(_E)"
-
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-msgid "Use the _mouse wheel on the desktop to switch workspaces"
-msgstr "在桌面上使用滑鼠滾輪以切換工作區(_M)"
+msgid "_Minimum size of windows to trigger smart placement:"
+msgstr "觸發智慧配置的最小視窗大小(_M):"
 
+#. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-msgid "When a window raises itself:"
-msgstr "當視窗抬升自己時:"
+msgid "<i>Large</i>"
+msgstr "<i>大</i> "
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
+msgid "By default, place windows:"
+msgstr "預設的視窗擺放位置:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
-msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "以實際的桌面配置決定工作區迴繞(_L)"
+msgid "At the _center of the screen"
+msgstr "於螢幕中央(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "抵達第一個或最後一個工作區時時迴繞工作區(_F)"
+msgid "Under the mouse _pointer"
+msgstr "在滑鼠指標之下(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
-msgid "_Accessibility"
-msgstr "輔助功能(_A)"
+msgid "_Placement"
+msgstr "配置(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-msgid "_Bring window on current workspace"
-msgstr "將視窗移至目前工作區(_B)"
+msgid "_Enable display compositing"
+msgstr "啟用顯示合成(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-msgid "_Draw frame around selected windows while cycling"
-msgstr "當循環時繪製所選視窗周圍的框架(_D)"
+msgid "Display _fullscreen overlay windows directly"
+msgstr "以直接覆蓋視窗的方式顯示全螢幕(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
-msgid "_Enable display compositing"
-msgstr "啟用顯示合成(_E)"
+msgid "Show shadows under _regular windows"
+msgstr "在一般視窗下顯示陰影(_R)"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
+msgid "Show shadows under pop_up windows"
+msgstr "在彈出式視窗下顯示陰影(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-msgid "_Include hidden (i.e. iconified) windows"
-msgstr "包含隱藏 (如:圖示化的) 視窗(_I)"
+msgid "Show shadows under _dock windows"
+msgstr "在 _dock 視窗下顯示陰影"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "觸發智慧配置的最小視窗大小(_M):"
+msgid "Opaci_ty of window decorations:"
+msgstr "視窗裝飾的不透明度(T):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45
-msgid "_Placement"
-msgstr "配置(_P)"
+msgid "<i>Transparent</i>"
+msgstr "<i>透明</i> "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-msgid "_Raise windows when any mouse button is pressed"
-msgstr "按下任一滑鼠鍵時抬升視窗(_R)"
+msgid "<i>Opaque</i>"
+msgstr "<i>不透明</i> "
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47
-msgid ""
-"_Remember and recall previous workspace\n"
-"when switching via keyboard shortcuts"
-msgstr ""
-"透過鍵盤捷徑切換時,記住並召回\n"
-"先前的工作區(_R)"
+msgid "Opacity of _inactive windows:"
+msgstr "非活動中視窗的不透明度(_I):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
+msgid "Opacity of windows during _move:"
+msgstr "移動視窗時的不透明度(M):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
-msgid ""
-"_Skip windows that have \"skip pager\"\n"
-"or \"skip taskbar\" properties set"
-msgstr "跳過屬性有設定「skip pager」或「skip taskbar」的視窗(_S)"
+msgid "Opacity of windows during resi_ze:"
+msgstr "調整視窗大小時的不透明度(_Z):"
+
+#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
+msgid "Opacity of popup window_s:"
+msgstr "彈出式視窗的不透明度(_S):"
 
-#  Number of workspaces
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51
-msgid "_Workspaces"
-msgstr "工作區(_W)"
+msgid "C_ompositor"
+msgstr "合成器(_O)"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-msgid "<b>Margins</b>"
-msgstr "<b>邊緣</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+msgid "_Number of workspaces:"
+msgstr "工作區數量(_N):"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>工作區</b>"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
+msgid "Layout"
+msgstr ""
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
+#, fuzzy
+msgid "Names"
+msgstr "名稱:"
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
+msgid "_General"
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "邊緣是螢幕邊上不能放置視窗的區域"
 
-#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
-msgid "_Number of workspaces:"
-msgstr "工作區數量(_N):"
+#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
+#, fuzzy
+msgid "_Margins"
+msgstr "邊緣"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:184
@@ -868,35 +878,35 @@ msgstr "工作區數量(_N):"
 msgid "%s (on %s)"
 msgstr "%s (於 %s)"
 
-#: ../src/main.c:540
+#: ../src/main.c:538
 msgid "Fork to the background"
 msgstr "分支至背景"
 
-#: ../src/main.c:542
+#: ../src/main.c:540
 msgid "Fork to the background (not supported)"
 msgstr "分支至背景 (未支援)"
 
-#: ../src/main.c:545
+#: ../src/main.c:543
 msgid "Set the compositor mode"
 msgstr "設定合成器模式"
 
-#: ../src/main.c:547
+#: ../src/main.c:545
 msgid "Set the compositor mode (not supported)"
 msgstr "設定合成器模式 (未支援)"
 
-#: ../src/main.c:549
+#: ../src/main.c:547
 msgid "Replace the existing window manager"
 msgstr "替換現存的視窗管理程式"
 
-#: ../src/main.c:550
+#: ../src/main.c:548
 msgid "Print version information and exit"
 msgstr "印出版本資訊並離開"
 
-#: ../src/main.c:558
+#: ../src/main.c:556
 msgid "[ARGUMENTS...]"
 msgstr "[引數...]"
 
-#: ../src/main.c:565
+#: ../src/main.c:563
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "輸入 \"%s --help\" 以瞭解用法。"
@@ -1031,6 +1041,15 @@ msgstr "從子代程序讀取資料時發生錯誤:%s\n"
 msgid "Cannot spawn helper-dialog: %s\n"
 msgstr "無法建立輔助程式對話窗:%s\n"
 
+#~ msgid "Set number and names of workspaces"
+#~ msgstr "設定工作區數目與名稱:"
+
+#~ msgid "<b>Margins</b>"
+#~ msgstr "<b>邊緣</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>工作區</b>"
+
 #  Workspace names
 #~ msgid "Change workspace name"
 #~ msgstr "變更工作區名稱"
@@ -1181,9 +1200,6 @@ msgstr "無法建立輔助程式對話窗:%s\n"
 #~ msgid "Change name"
 #~ msgstr "改變名稱"
 
-#~ msgid "Name:"
-#~ msgstr "名稱:"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "選取一個工作區名稱來編輯它"
 
@@ -1199,9 +1215,6 @@ msgstr "無法建立輔助程式對話窗:%s\n"
 #~ msgid "Workspaces and Margins"
 #~ msgstr "工作區和邊緣"
 
-#~ msgid "Margins"
-#~ msgstr "邊緣"
-
 #~ msgid "Window Manager Settings"
 #~ msgstr "視窗管理程式設定"
 


More information about the Xfce4-commits mailing list